diff --git a/CLIENT_DATA/Ricktendo_NET40_package.xml b/CLIENT_DATA/Ricktendo_NET40_package.xml
deleted file mode 100644
index 6ed80a6..0000000
--- a/CLIENT_DATA/Ricktendo_NET40_package.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CLIENT_DATA/Sereby_NET45_package.xml b/CLIENT_DATA/Sereby_NET45_package.xml
deleted file mode 100644
index 27a090f..0000000
--- a/CLIENT_DATA/Sereby_NET45_package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CLIENT_DATA/WinPKG.xml b/CLIENT_DATA/WinPKG.xml
new file mode 100644
index 0000000..7a22e51
--- /dev/null
+++ b/CLIENT_DATA/WinPKG.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index d03460a..52689c1 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -1,61 +1,6 @@
DefVar $reboot$
Set $reboot$ = "false"
-if ($sereby_dotnet1.1$ = "reinstall")
- if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E78BFA60-5393-4C38-82AB-E8019E464EB4}] DisplayName") = "")
- comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
- Winbatch_uninstall_msi_net11_deu_32
- sub_check_exitcode
- endif
- Winbatch_dotnet1.1_uninstall
- opsiservicecall_dotnet1.1_uninstall
- Set $reboot$ = "true"
-endif
-if ($sereby_dotnet2.0$ = "reinstall")
- if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C314CE45-3392-3B73-B4E1-139CD41CA933}] DisplayName") = "")
- comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
- Winbatch_uninstall_msi_net20_deu_32
- sub_check_exitcode
- endif
- Winbatch_dotnet2.0_uninstall
- opsiservicecall_dotnet2.0_uninstall
- Set $reboot$ = "true"
-endif
-if ($sereby_dotnet3.0$ = "reinstall")
- if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C2C284D2-6BD7-3B34-B0C5-B2CAED168DF7}] DisplayName") = "")
- comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
- Winbatch_uninstall_msi_net30_deu_32
- sub_check_exitcode
- endif
- Winbatch_dotnet3.0_uninstall
- opsiservicecall_dotnet3.0_uninstall
- Set $reboot$ = "true"
-endif
-if ($sereby_dotnet3.5$ = "reinstall")
- if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{052FDD78-A6EA-3187-8386-C82F4CA3A929}] DisplayName") = "")
- comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
- Winbatch_uninstall_msi_net35_deu_32
- sub_check_exitcode
- endif
- Winbatch_dotnet3.5_uninstall
- opsiservicecall_dotnet3.5_uninstall
- Set $reboot$ = "true"
-endif
-if ($sereby_dotnet4.0$ = "reinstall")
- if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C911A0C2-2236-3164-AA47-F2566C01AE5E}] DisplayName") = "")
- comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
- Winbatch_uninstall_msi_net40_extended_deu_32
- sub_check_exitcode
- endif
- if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{F750C986-5310-3A5A-95F8-4EC71C8AC01C}] DisplayName") = "")
- comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
- Winbatch_uninstall_msi_net40_client_deu_32
- sub_check_exitcode
- endif
- Winbatch_dotnet4.0_uninstall
- opsiservicecall_dotnet4.0_uninstall
- Set $reboot$ = "true"
-endif
if ($sereby_dotnet4.5$ = "reinstall")
Winbatch_dotnet4.5_uninstall
opsiservicecall_dotnet4.5_uninstall
@@ -108,11 +53,6 @@ if ($sereby_msdx9$ = "reinstall")
opsiservicecall_msdx9_uninstall
Set $reboot$ = "true"
endif
-if ($sereby_msdxm$ = "reinstall")
- Dosbatch_msdxm_uninstall
- opsiservicecall_msdxm_uninstall
- Set $reboot$ = "true"
-endif
if ($sereby_msvc$ = "reinstall")
Dosbatch_msvc_uninstall
opsiservicecall_msvc_uninstall
diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins
index 34b6acb..71a1c6c 100644
--- a/CLIENT_DATA/config3264.ins
+++ b/CLIENT_DATA/config3264.ins
@@ -1,21 +1,6 @@
DosInAnIcon_init_config
-if ($sereby_dotnet1.1$ = "install")
- DosInAnIcon_dotnet1.1_config
-endif
-if ($sereby_dotnet2.0$ = "install")
- DosInAnIcon_dotnet2.0_config
-endif
-if ($sereby_dotnet3.0$ = "install")
- DosInAnIcon_dotnet3.0_config
-endif
-if ($sereby_dotnet3.5$ = "install")
- DosInAnIcon_dotnet3.5_config
-endif
-if ($sereby_dotnet4.0$ = "install")
- DosInAnIcon_dotnet4.0_config
-endif
if ($sereby_dotnet4.5$ = "install")
DosInAnIcon_dotnet4.5_config
endif
@@ -70,26 +55,6 @@ xml ed -O -u "/settings/timer[@value=40]/@value" -v $sereby_timer_value$ "$LogDi
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $sereby_timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
-[DosInAnIcon_dotnet1.1_config]
-copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
-xml ed -O -u "/settings/set[@component='net1.1']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
-
-[DosInAnIcon_dotnet2.0_config]
-copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
-xml ed -O -u "/settings/set[@component='net2.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
-
-[DosInAnIcon_dotnet3.0_config]
-copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
-xml ed -O -u "/settings/set[@component='net3.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
-
-[DosInAnIcon_dotnet3.5_config]
-copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
-xml ed -O -u "/settings/set[@component='net3.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
-
-[DosInAnIcon_dotnet4.0_config]
-copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
-xml ed -O -u "/settings/set[@component='net4.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
-
[DosInAnIcon_dotnet4.5_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
@@ -130,10 +95,6 @@ xml ed -O -u "/settings/set[@component='basicruntimes']/@checked" -v 1 "$LogDir$
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='msdx9']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
-[DosInAnIcon_msdxm_config]
-copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
-xml ed -O -u "/settings/set[@component='msdxm']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
-
[DosInAnIcon_msvc_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='msvc']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc
index 663a1f6..86d2059 100644
--- a/CLIENT_DATA/define3264.inc
+++ b/CLIENT_DATA/define3264.inc
@@ -4,16 +4,6 @@ DefVar $sereby_timer_value$
Set $sereby_timer_value$ = GetProductProperty("sereby_timer_value", "5")
DefVar $sereby_timer_enabled$
Set $sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1")
-DefVar $sereby_dotnet1.1$
-Set $sereby_dotnet1.1$ = GetProductProperty("sereby_dotnet1.1", "install")
-DefVar $sereby_dotnet2.0$
-Set $sereby_dotnet2.0$ = GetProductProperty("sereby_dotnet2.0", "install")
-DefVar $sereby_dotnet3.0$
-Set $sereby_dotnet3.0$ = GetProductProperty("sereby_dotnet3.0", "install")
-DefVar $sereby_dotnet3.5$
-Set $sereby_dotnet3.5$ = GetProductProperty("sereby_dotnet3.5", "install")
-DefVar $sereby_dotnet4.0$
-Set $sereby_dotnet4.0$ = GetProductProperty("sereby_dotnet4.0", "none")
DefVar $sereby_dotnet4.5$
Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install")
DefVar $sereby_win8xdotnet3x$
@@ -34,8 +24,6 @@ DefVar $sereby_basicruntimes$
Set $sereby_basicruntimes$ = GetProductProperty("sereby_basicruntimes", "install")
DefVar $sereby_msdx9$
Set $sereby_msdx9$ = GetProductProperty("sereby_msdx9", "install")
-DefVar $sereby_msdxm$
-Set $sereby_msdxm$ = GetProductProperty("sereby_msdxm", "install")
DefVar $sereby_msvc$
Set $sereby_msvc$ = GetProductProperty("sereby_msvc", "install")
DefVar $sereby_AdobeFlash$
diff --git a/OPSI/control b/OPSI/control
index ff5f360..19be829 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -54,51 +54,6 @@ description: Timer enabled
values: ["0", "1"]
default: ["1"]
-[ProductProperty]
-type: unicode
-name: sereby_dotnet1.1
-multivalue: False
-editable: False
-description: Install Microsoft Netframework 1.1
-values: ["install", "none", "reinstall"]
-default: ["install"]
-
-[ProductProperty]
-type: unicode
-name: sereby_dotnet2.0
-multivalue: False
-editable: False
-description: Install Microsoft Netframework 2.0
-values: ["install", "none", "reinstall"]
-default: ["install"]
-
-[ProductProperty]
-type: unicode
-name: sereby_dotnet3.0
-multivalue: False
-editable: False
-description: Install Microsoft Netframework 3.0
-values: ["install", "none", "reinstall"]
-default: ["install"]
-
-[ProductProperty]
-type: unicode
-name: sereby_dotnet3.5
-multivalue: False
-editable: False
-description: Install Microsoft Netframework 3.5
-values: ["install", "none", "reinstall"]
-default: ["install"]
-
-[ProductProperty]
-type: unicode
-name: sereby_dotnet4.0
-multivalue: False
-editable: False
-description: Install Microsoft Netframework 4.0
-values: ["install", "none", "reinstall"]
-default: ["install"]
-
[ProductProperty]
type: unicode
name: sereby_dotnet4.5
@@ -189,15 +144,6 @@ description: Install Microsoft DirectX 9.0c Redistributable
values: ["install", "none", "reinstall"]
default: ["install"]
-[ProductProperty]
-type: unicode
-name: sereby_msdxm
-multivalue: False
-editable: False
-description: Install Microsoft DirectX for Managed Code
-values: ["install", "none", "reinstall"]
-default: ["install"]
-
[ProductProperty]
type: unicode
name: sereby_msvc
diff --git a/aio-runtimes_v2.1.6.1.exe.sha1sum b/aio-runtimes_v2.1.6.1.exe.sha1sum
new file mode 100644
index 0000000..9d4a8f8
--- /dev/null
+++ b/aio-runtimes_v2.1.6.1.exe.sha1sum
@@ -0,0 +1 @@
+2f8a76f59ba6866dbe367d5ef6fdf1508bc7e735 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.6.1/X86/aio-runtimes_v2.1.6.1.exe
diff --git a/air_14.0.0.110_win.exe.sha1sum b/air_14.0.0.110_win.exe.sha1sum
index c7ddfb5..141789b 100644
--- a/air_14.0.0.110_win.exe.sha1sum
+++ b/air_14.0.0.110_win.exe.sha1sum
@@ -1 +1 @@
-a74677e3ed65316deb15115fe205add3b6adaf8c /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.3.1/X86/air_14.0.0.110_win.exe
+a74677e3ed65316deb15115fe205add3b6adaf8c /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.6.1/X86/air_14.0.0.110_win.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index 21d6f37..54c46fc 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="sereby.org"
PN="sereby.aio"
NAME="All in One Runtimes"
DESCRIPTION="Das All in One Runtimes Paket buendelt alle wichtigen Runtime Pakete die benoetigt werden um sicherzustellen, dass alle Programme auch reibungslos funktionieren."
-VERSION="2.1.5.1"
+VERSION="2.1.6.1"
RELEASE="1"
PRIORITY="0"
ADVICE=""
@@ -48,15 +48,15 @@ JRE8VERSION="8.0.510.13"
# ==================================
FLASHUPDATE="1"
-FLASHVERSION="14.0.0.125"
-FLASHAXVERSION="14.0.0.125"
+FLASHVERSION="14.0.0.145"
+FLASHAXVERSION="14.0.0.145"
# ==================================
# Update Adobe Schockave
# ==================================
SHOCKUPDATE="1"
-SHOCKVERSION="12.1.2.152"
+SHOCKVERSION="12.1.3.153"
# ==================================
# Update Microsoft Silverlight
@@ -76,7 +76,6 @@ RICKTENDOAIO="2014.04.07"
# Take Ricktendo .net Update
# ==================================
-RICKTENDONET40UPDATE="1"
RICKTENDONET45UPDATE="1"
RICKTENDONET45VER="452"
RICKTENDONET="2014.05.26"
@@ -86,7 +85,7 @@ RICKTENDONET="2014.05.26"
# ==================================
GENERALUPDATE="1"
-GENERALVERSION="1.1.0.9-go2"
+GENERALVERSION="1.1.0.10-go2"
# ==================================
# MSVC Runtimes Verison
@@ -112,11 +111,10 @@ DL_FILE[0]="102791693_ff1cd10758.jpg"
DL_SOURCE[0]="http://www.chip.de/ii/102791693_ff1cd10758.jpg"
## 1: 32 & 64 Bit Runtimes
-DL_FILE[7]="aio-runtimes_v${VERSION}.7z"
-DL_SOURCE[7]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/73088/?download"
+DL_FILE[7]="aio-runtimes_v${VERSION}.exe"
+DL_SOURCE[7]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/73448/?download"
DL_ARCH[7]="X86"
-DL_EXTRACT_FORMAT[7]="7zip"
-DL_EXTRACT_TO[7]="sereby"
+DL_WINST_NAME[7]=SerebyExe
if [ "$USEWIN8ISO" = "1" ]; then
@@ -218,41 +216,29 @@ DL_SOURCE[22]="http://ricktendo.info/Repack/VBCFJRedist_AIO_x86_x64.exe"
DL_ARCH[22]="X86"
DL_WINST_NAME[22]=RicktendoAioExe
-# The DL_FILE[23] - DL_FILE[22] is also used in the builder-target-cb.sh
-# if you change also change there
-DL_FILE[23]="dotNetFx40_Full_x86_x64_Slim_${RICKTENDONET}.exe"
-DL_SOURCE[23]="http://ricktendo.info/Repack/dotNetFx40_Full_x86_x64_Slim.exe"
+DL_FILE[23]="dotNetFx45_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe"
+DL_SOURCE[23]="http://ricktendo.info/Repack/dotNetFx${RICKTENDONET45VER}_Full_LDR_x86_x64_Slim.exe"
DL_ARCH[23]="X86"
-DL_WINST_NAME[23]=RicktendoNet40Exe
+DL_WINST_NAME[23]=Ricktendo45Exe
-DL_FILE[24]="dotNetFx40LP_Full_x86_x64de_Slim_${RICKTENDONET}.7z"
-DL_SOURCE[24]="http://ricktendo.info/Archive/LP/dotNetFx40LP_Full_x86_x64de_Slim.7z"
+DL_FILE[24]="dotNetFx45LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z"
+DL_SOURCE[24]="http://ricktendo.info/Archive/LP/dotNetFx${RICKTENDONET45VER}LP_Full_LDR_x86_x64de_Slim.7z"
DL_ARCH[24]="X86"
-DL_WINST_NAME[24]=RicktendoNet40Lang
+DL_WINST_NAME[24]=RicktendoNet45Lang
-DL_FILE[25]="dotNetFx45_Full_LDR_x86_x64_Slim_${RICKTENDONET}.exe"
-DL_SOURCE[25]="http://ricktendo.info/Repack/dotNetFx${RICKTENDONET45VER}_Full_LDR_x86_x64_Slim.exe"
+# General Runtimes
+DL_FILE[25]="geos_one-general-runtimes_${GENERALVERSION}.7z"
+DL_SOURCE[25]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z"
DL_ARCH[25]="X86"
-DL_WINST_NAME[25]=Ricktendo45Exe
+DL_EXTRACT_FORMAT[25]="7zip"
+DL_EXTRACT_TO[25]="Basic"
-DL_FILE[26]="dotNetFx45LP_Full_LDR_x86_x64de_Slim_${RICKTENDONET}.7z"
-DL_SOURCE[26]="http://ricktendo.info/Archive/LP/dotNetFx${RICKTENDONET45VER}LP_Full_LDR_x86_x64de_Slim.7z"
+# General Runtimes
+DL_FILE[26]="geos_one-microsoft-msvc_${MSVCVERSION}.7z"
+DL_SOURCE[26]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z"
DL_ARCH[26]="X86"
-DL_WINST_NAME[26]=RicktendoNet45Lang
-
-# General Runtimes
-DL_FILE[27]="geos_one-general-runtimes_${GENERALVERSION}.7z"
-DL_SOURCE[27]="http://ftp.disconnected-by-peer.at/AIO/general-runtimes_${GENERALVERSION}.7z"
-DL_ARCH[27]="X86"
-DL_EXTRACT_FORMAT[27]="7zip"
-DL_EXTRACT_TO[27]="Basic"
-
-# General Runtimes
-DL_FILE[28]="geos_one-microsoft-msvc_${MSVCVERSION}.7z"
-DL_SOURCE[28]="http://ftp.disconnected-by-peer.at/AIO/microsoft-msvc_${MSVCVERSION}.7z"
-DL_ARCH[28]="X86"
-DL_EXTRACT_FORMAT[28]="7zip"
-DL_EXTRACT_TO[28]="MSVC"
+DL_EXTRACT_FORMAT[26]="7zip"
+DL_EXTRACT_TO[26]="MSVC"
##################
### Uninstallers
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 499de9c..10c1341 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -86,7 +86,7 @@ function create() {
mkdir -p $INST_DIR/CLIENT_DATA/{Install/Packages/BasicRuntimes,Install/Packages/Air,Config}
mkdir -p $INST_DIR/CLIENT_DATA/UnInstall/Packages/{Flash,Shockwave,Silverlight}
- 7z x -o$INST_DIR/CLIENT_DATA/Install $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.exe
+ 7z x -o$INST_DIR/CLIENT_DATA/Install $INST_DIR/CLIENT_DATA/X86/${DL_FILE[7]}
# ==========================================================================================================
# Place some tools for later use into the packages dir
@@ -99,15 +99,9 @@ function create() {
# sed everything to disabled
# ==========================================================================================================
- # !!! remove me whne fixed !!!
- mv $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml.old
- cat $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml.old | grep -v NetWin8 > $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml
- rm $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml.old
- sed -e 's/.*<\/settings>.*/\t\n&/' -i $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml
- # !!! remove me whne fixed !!!
+ sed -e 's!\"1\"!\"0\"!g' -e 's!maximized=\"0\"!maximized=\"1\"!' $INST_DIR/CLIENT_DATA/WinPKG.xml > $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
+ rm $INST_DIR/CLIENT_DATA/WinPKG.xml
- sed -e 's!\"1\"!\"0\"!g' -e 's!maximized=\"0\"!maximized=\"1\"!' $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml > $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
-
# ==========================================================================================================
# extract .net 8.0 & 8.1 now so the unix2dos dont change the extracted files
# ==========================================================================================================
@@ -246,23 +240,14 @@ function create() {
sed -e 's/.*<\/settings>.*/\t\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
# ==========================================================================================================
- # Update .NET 4.0 & 4.5 with Ricktendo
+ # Update .NET 4.5 with Ricktendo
# ==========================================================================================================
- if [ "$RICKTENDONET40UPDATE" = "1" ]; then
- rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.0/*
- 7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.0 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[23]}
- 7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.0 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[24]}
- mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET40_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.0/package.xml
- else
- rm $INST_DIR/CLIENT_DATA/Ricktendo_NET40_package.xml
- fi
-
if [ "$RICKTENDONET45UPDATE" = "1" ]; then
rm -rf $INST_DIR/CLIENT_DATA/Install/NET/4.5
mkdir -p $INST_DIR/CLIENT_DATA/Install/NET/4.5
- 7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[25]}
- 7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[26]}
+ 7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[23]}
+ 7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[24]}
mv -v $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml $INST_DIR/CLIENT_DATA/Install/NET/4.5/package.xml
else
rm $INST_DIR/CLIENT_DATA/Ricktendo_NET45_package.xml
@@ -321,50 +306,14 @@ function create() {
# ==========================================================================================================
if [ "$CREATENEWSEREBY" = "1" ]; then
- sed -e 's!\"0\"!\"1\"!g' $INST_DIR/CLIENT_DATA/Config/WinPKG.xml > $INST_DIR/CLIENT_DATA/X86/sereby/WinPKG.xml
- 7z a $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.7z $INST_DIR/CLIENT_DATA/Install/*
- mv -v $INST_DIR/CLIENT_DATA/AIO_7zip_config.txt $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/7zip_config.txt
- cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/7zip_config.txt $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.7z > $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.exe
- rm $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/7zip_config.txt $INST_DIR/CLIENT_DATA/X86/sereby/svcpack/aio-runtimes.7z
- SVCDATE=`date +"%d.%m.%Y"`
- write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "version" "${VERSION}"
- write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "builddate" "${SVCDATE}"
- write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "title" "Sereby's AiO Runtimes ( http://www.sereby.org ) with Geos One's Mods"
- write_svcpack_file $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini "general" "website" "http://opsi.disconnected-by-peer.at"
- unix2dos $INST_DIR/CLIENT_DATA/X86/sereby/entries_AiORuntimes.ini
+ sed -e 's!\"0\"!\"1\"!g' $INST_DIR/CLIENT_DATA/Config/WinPKG.xml > $INST_DIR/CLIENT_DATA/Install/WinPKG.xml
+ 7z a $INST_DIR/CLIENT_DATA/X86/sereby/aio-runtimes.7z $INST_DIR/CLIENT_DATA/Install/*
+ rm $INST_DIR/CLIENT_DATA/Install/WinPKG.xml
+ mv -v $INST_DIR/CLIENT_DATA/AIO_7zip_config.txt $INST_DIR/CLIENT_DATA/X86/sereby/7zip_config.txt
mkdir -p $OPSI_REPOS_PRODUCT_DIR
- 7z a $OPSI_REPOS_PRODUCT_DIR/$OPSI_REPOS_FILE_PATTERN.7z $INST_DIR/CLIENT_DATA/X86/sereby/*
+ cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/X86/sereby/7zip_config.txt $INST_DIR/CLIENT_DATA/X86/sereby/aio-runtimes.7z > $OPSI_REPOS_PRODUCT_DIR/$OPSI_REPOS_FILE_PATTERN.exe
fi
- # ==========================================================================================================
- # correct sereby .net 3.5 for opsi use
- # ==========================================================================================================
-
- # Serby and its hacks workaround (sereby pack wants to copy a file on install but thats not possible on a readonly device in opsi
- # move the combined x86/x64 to a common name
- mv $INST_DIR/CLIENT_DATA/Install/NET/3.5 $INST_DIR/CLIENT_DATA/Install/NET/35
- # recreate the new dir
- mkdir -p $INST_DIR/CLIENT_DATA/Install/NET/3.5
- # move the common dir to the x86 name under the new dir
- mv $INST_DIR/CLIENT_DATA/Install/NET/35 $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86
- # remove the copy from the install.bat
- sed -e '/^copy/d' -i $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/_Install.bat
- # move the package.xml un dir up
- mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/package.xml $INST_DIR/CLIENT_DATA/Install/NET/3.5
- # now link copy the x86 dir to x64
- cp -al $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86 $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64
- # do the copy for x86 (seded away erlyer)
- mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/vs_setup_x86.msi $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/vs_setup.msi
- mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/setup_x86.sdb $INST_DIR/CLIENT_DATA/Install/NET/3.5/x86/setup.sdb
- # do the copy for x64 (seded away erlyer)
- mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/vs_setup_x64.msi $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/vs_setup.msi
- mv $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/setup_x64.sdb $INST_DIR/CLIENT_DATA/Install/NET/3.5/x64/setup.sdb
- # create a new install.bat that calls the right setup from the right dir
- echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat
- echo "set arch=%1" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat
- echo "call %~dp0\%arch%\_Install.bat" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat
- echo "" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat
-
# ==========================================================================================================
# Disable Java Update check
# ==========================================================================================================
diff --git a/dotNetFx40LP_Full_x86_x64de_Slim_2014.05.26.7z.sha1sum b/dotNetFx40LP_Full_x86_x64de_Slim_2014.05.26.7z.sha1sum
deleted file mode 100644
index d57d161..0000000
--- a/dotNetFx40LP_Full_x86_x64de_Slim_2014.05.26.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-72f33ba4874da23777bd004841b7ed989a721311 /home/mario/.opsi-dist-cache/sereby.aio-2.1.3.1/X86/dotNetFx40LP_Full_x86_x64de_Slim_2014.05.26.7z
diff --git a/dotNetFx40_Full_x86_x64_Slim_2014.05.26.exe.sha1sum b/dotNetFx40_Full_x86_x64_Slim_2014.05.26.exe.sha1sum
deleted file mode 100644
index d16e301..0000000
--- a/dotNetFx40_Full_x86_x64_Slim_2014.05.26.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-7f610621036e886c4e0be84b982cfc1ac135b90c /home/mario/.opsi-dist-cache/sereby.aio-2.1.3.1/X86/dotNetFx40_Full_x86_x64_Slim_2014.05.26.exe
diff --git a/dotnetfx_5F00_cleanup_5F00_tool-2014-07-10.zip.sha1sum b/dotnetfx_5F00_cleanup_5F00_tool-2014-07-10.zip.sha1sum
new file mode 100644
index 0000000..ac625ad
--- /dev/null
+++ b/dotnetfx_5F00_cleanup_5F00_tool-2014-07-10.zip.sha1sum
@@ -0,0 +1 @@
+add9e0a7e3f4e5ca64c771402a5f6c3a93678187 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.5.1/X86/dotnetfx_5F00_cleanup_5F00_tool-2014-07-10.zip
diff --git a/geos_one-general-runtimes_1.1.0.10-go2.7z.sha1sum b/geos_one-general-runtimes_1.1.0.10-go2.7z.sha1sum
new file mode 100644
index 0000000..dd08c39
--- /dev/null
+++ b/geos_one-general-runtimes_1.1.0.10-go2.7z.sha1sum
@@ -0,0 +1 @@
+da39a3ee5e6b4b0d3255bfef95601890afd80709 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.6.1/X86/geos_one-general-runtimes_1.1.0.10-go2.7z
diff --git a/geos_one-general-runtimes_1.1.0.9-go2.7z.sha1sum b/geos_one-general-runtimes_1.1.0.9-go2.7z.sha1sum
deleted file mode 100644
index b2f9cc9..0000000
--- a/geos_one-general-runtimes_1.1.0.9-go2.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-cef35ebd5cf477c8292abfffd0085f6d2520bb58 /home/mario/.opsi-dist-cache/sereby.aio-2.1.1.1/X86/geos_one-general-runtimes_1.1.0.9-go2.7z
diff --git a/install_flash_player-14.0.0.125.exe.sha1sum b/install_flash_player-14.0.0.125.exe.sha1sum
deleted file mode 100644
index 2d0fdbf..0000000
--- a/install_flash_player-14.0.0.125.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-63dd2723df8cf8a9b93d542c71b3db7075dcd6aa /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.3.1/X86/install_flash_player-14.0.0.125.exe
diff --git a/install_flash_player-14.0.0.145.exe.sha1sum b/install_flash_player-14.0.0.145.exe.sha1sum
new file mode 100644
index 0000000..7ade53b
--- /dev/null
+++ b/install_flash_player-14.0.0.145.exe.sha1sum
@@ -0,0 +1 @@
+ea14121ec53c1a98cf6b72062fa14253041e122e /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.6.1/X86/install_flash_player-14.0.0.145.exe
diff --git a/install_flash_player_ax-14.0.0.125.exe.sha1sum b/install_flash_player_ax-14.0.0.125.exe.sha1sum
deleted file mode 100644
index 6ba5a13..0000000
--- a/install_flash_player_ax-14.0.0.125.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-1aa4e422e06862eb25cb1bb4745df4f218610f64 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.3.1/X86/install_flash_player_ax-14.0.0.125.exe
diff --git a/install_flash_player_ax-14.0.0.145.exe.sha1sum b/install_flash_player_ax-14.0.0.145.exe.sha1sum
new file mode 100644
index 0000000..e363ba1
--- /dev/null
+++ b/install_flash_player_ax-14.0.0.145.exe.sha1sum
@@ -0,0 +1 @@
+4526de82ad42d5122bc11532b57c41a06a33feed /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.6.1/X86/install_flash_player_ax-14.0.0.145.exe
diff --git a/sw_lic_full_installer-12.1.2.152.msi.sha1sum b/sw_lic_full_installer-12.1.2.152.msi.sha1sum
deleted file mode 100644
index 16bc1f6..0000000
--- a/sw_lic_full_installer-12.1.2.152.msi.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-79c8c94f5fd2bdca677c18ac1dd29f67c441d5d4 /home/mario/.opsi-dist-cache/sereby.aio-2.1.3.1/X86/sw_lic_full_installer-12.1.2.152.msi
diff --git a/sw_lic_full_installer-12.1.3.153.msi.sha1sum b/sw_lic_full_installer-12.1.3.153.msi.sha1sum
new file mode 100644
index 0000000..30dcfc7
--- /dev/null
+++ b/sw_lic_full_installer-12.1.3.153.msi.sha1sum
@@ -0,0 +1 @@
+9d269c3bdb09cbf847101494490af9110e55b0ab /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.6.1/X86/sw_lic_full_installer-12.1.3.153.msi
diff --git a/uninstall_flash_player-14.0.0.125.exe.sha1sum b/uninstall_flash_player-14.0.0.125.exe.sha1sum
deleted file mode 100644
index 7f4747a..0000000
--- a/uninstall_flash_player-14.0.0.125.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-fe7fe294c1a1a9a93909edf787e613932c7b25df /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.3.1/X86/uninstall_flash_player-14.0.0.125.exe
diff --git a/uninstall_flash_player-14.0.0.145.exe.sha1sum b/uninstall_flash_player-14.0.0.145.exe.sha1sum
new file mode 100644
index 0000000..4cbc956
--- /dev/null
+++ b/uninstall_flash_player-14.0.0.145.exe.sha1sum
@@ -0,0 +1 @@
+d01af8ed82bcc35958b92e061e00d43d5072bf15 /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.6.1/X86/uninstall_flash_player-14.0.0.145.exe
diff --git a/uninstall_shock_player-12.1.2.152.exe.sha1sum b/uninstall_shock_player-12.1.2.152.exe.sha1sum
deleted file mode 100644
index 31ed38a..0000000
--- a/uninstall_shock_player-12.1.2.152.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-4096c02f32cbfc479d491bbd5b4dc72dfd4f7b4d /home/mario/.opsi-dist-cache/sereby.aio-2.1.3.1/X86/uninstall_shock_player-12.1.2.152.exe
diff --git a/uninstall_shock_player-12.1.3.153.exe.sha1sum b/uninstall_shock_player-12.1.3.153.exe.sha1sum
new file mode 100644
index 0000000..5406131
--- /dev/null
+++ b/uninstall_shock_player-12.1.3.153.exe.sha1sum
@@ -0,0 +1 @@
+4096c02f32cbfc479d491bbd5b4dc72dfd4f7b4d /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.1.6.1/X86/uninstall_shock_player-12.1.3.153.exe