diff --git a/CLIENT_DATA/AdobeAIR_7zip_config.txt b/CLIENT_DATA/AdobeAIR_7zip_config.txt
index 5aa554b..c4a9d22 100644
--- a/CLIENT_DATA/AdobeAIR_7zip_config.txt
+++ b/CLIENT_DATA/AdobeAIR_7zip_config.txt
@@ -1,6 +1,6 @@
;!@Install@!UTF-8!
-RunProgram="air3-8_win.exe -silent -eulaAccepted"
-ExtractTitle="Geos One Adobe Air 3.8 Installer"
-ExtractDialogText="Extracting Adobe AIR 3.8"
+RunProgram="air3-9_win.exe -silent -eulaAccepted"
+ExtractTitle="Geos One Adobe Air 3.9 Installer"
+ExtractDialogText="Extracting Adobe AIR 3.9"
GUIMode="1"
;!@InstallEnd@!
diff --git a/CLIENT_DATA/GeosOne_BR_package.xml b/CLIENT_DATA/GeosOne_BR_package.xml
old mode 100755
new mode 100644
diff --git a/CLIENT_DATA/Ricktendo_FS_package.xml b/CLIENT_DATA/Ricktendo_FS_package.xml
new file mode 100644
index 0000000..1f424b7
--- /dev/null
+++ b/CLIENT_DATA/Ricktendo_FS_package.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CLIENT_DATA/Ricktendo_JS_package.xml b/CLIENT_DATA/Ricktendo_JS_package.xml
index 26f9711..d37a40e 100644
--- a/CLIENT_DATA/Ricktendo_JS_package.xml
+++ b/CLIENT_DATA/Ricktendo_JS_package.xml
@@ -1,9 +1,7 @@
-
+
-
-
-
-
+
+
\ No newline at end of file
diff --git a/CLIENT_DATA/Ricktendo_NET40_package.xml b/CLIENT_DATA/Ricktendo_NET40_package.xml
new file mode 100644
index 0000000..22cf7c2
--- /dev/null
+++ b/CLIENT_DATA/Ricktendo_NET40_package.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CLIENT_DATA/Ricktendo_NET45_package.xml b/CLIENT_DATA/Ricktendo_NET45_package.xml
new file mode 100644
index 0000000..0fac288
--- /dev/null
+++ b/CLIENT_DATA/Ricktendo_NET45_package.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CLIENT_DATA/Ricktendo_VC_package.xml b/CLIENT_DATA/Ricktendo_VC_package.xml
index 37ebbe2..9e4a07e 100644
--- a/CLIENT_DATA/Ricktendo_VC_package.xml
+++ b/CLIENT_DATA/Ricktendo_VC_package.xml
@@ -2,44 +2,44 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index 75649b2..056a495 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -73,6 +73,11 @@ if ($sereby_msjsharp$ = "reinstall")
opsiservicecall_msjsharp_uninstall
Set $reboot$ = "true"
endif
+if ($sereby_msfsharp$ = "reinstall")
+ Winbatch_msfsharp_uninstall
+ opsiservicecall_msfsharp_uninstall
+ Set $reboot$ = "true"
+endif
if ($sereby_silver$ = "reinstall")
Winbatch_silver_uninstall
opsiservicecall_silver_uninstall
@@ -208,6 +213,17 @@ endif
"%opsiserviceUser%"
]
+[Winbatch_msfsharp_uninstall]
+
+[opsiservicecall_msfsharp_uninstall]
+"method": "setProductProperty"
+"params": [
+"$ProductId$",
+"sereby_msfsharp",
+"install",
+"%opsiserviceUser%"
+]
+
[Winbatch_silver_uninstall]
; wmic product where caption='Microsoft Silverlight' call uninstall
"%ScriptPath%\UnInstall\Package\Silverlight\CleanSilverlight.cmd"
diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins
index f9832b1..12a7440 100644
--- a/CLIENT_DATA/config3264.ins
+++ b/CLIENT_DATA/config3264.ins
@@ -22,6 +22,9 @@ endif
if ($sereby_msjsharp$ = "install")
DosInAnIcon_msjsharp_config
endif
+if ($sereby_msfsharp$ = "install")
+ DosInAnIcon_msfsharp_config
+endif
if ($sereby_silver$ = "install")
DosInAnIcon_silver_config
endif
@@ -89,6 +92,10 @@ xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v 1 "$LogDir$\WinPKG
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='msjsharp']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+[DosInAnIcon_msfsharp_config]
+copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
+xml ed -O -u "/settings/set[@component='msfsharp']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
+
[DosInAnIcon_silver_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='silver']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc
index 3881ce1..a98d9a9 100644
--- a/CLIENT_DATA/define3264.inc
+++ b/CLIENT_DATA/define3264.inc
@@ -18,6 +18,8 @@ DefVar $sereby_dotnet4.5$
Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install")
DefVar $sereby_msjsharp$
Set $sereby_msjsharp$ = GetProductProperty("sereby_msjsharp", "install")
+DefVar $sereby_msfsharp$
+Set $sereby_msfsharp$ = GetProductProperty("sereby_msfsharp", "install")
DefVar $sereby_silver$
Set $sereby_silver$ = GetProductProperty("sereby_silver", "install")
DefVar $sereby_jre$
diff --git a/OPSI/control b/OPSI/control
index 48474e6..623ebec 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -117,6 +117,15 @@ description: Install Microsoft Visual J-Sharp 2.0 SE
values: ["install", "none", "reinstall"]
default: ["install"]
+[ProductProperty]
+type: unicode
+name: sereby_msfsharp
+multivalue: False
+editable: False
+description: Install Microsoft Visual F-Sharp 2.0 SE
+values: ["install", "none", "reinstall"]
+default: ["install"]
+
[ProductProperty]
type: unicode
name: sereby_silver
diff --git a/builder-product.cfg b/builder-product.cfg
index ccf5b8e..45e539e 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -55,7 +55,7 @@ SILVERVERSION="5.1.20513.0"
# Take Parts of Ricktendo Update
# ==================================
-RICKTENDOMSVCUPDATE="0"
+RICKTENDOMSVCUPDATE="1"
RICKTENDOJSHARPUPDATE="1"
RICKTENDOAIO="2013.8.22"
@@ -64,6 +64,14 @@ MSVC2008VER="9.00.30729.7523"
MSVC2010VER="10.00.40219.01"
MSVC2012VER="11.0.60610.1"
+# ==================================
+# Take Ricktendo .net Update
+# ==================================
+
+RICKTENDONET40UPDATE="1"
+RICKTENDONET45UPDATE="1"
+RICKTENDONET="2013.8.15"
+
# ==================================
# General Runtimes Verison
# ==================================
@@ -149,7 +157,8 @@ DL_ARCH[13]="X86"
DL_WINST_NAME[13]=InstallFlashIeExe
DL_FILE[14]="sw_lic_full_installer-${SHOCKVERSION}.msi"
-DL_SOURCE[14]="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi"
+DL_SOURCE[14]="http://brianspcrepair.com/ricktendo/Setup/sw_lic_full_installer.msi"
+#DL_SOURCE[14]="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi"
DL_ARCH[14]="X86"
DL_WINST_NAME[14]=InstallShockMsi
@@ -174,11 +183,33 @@ DL_SOURCE[18]="http://brianspcrepair.com/ricktendo/Setup/VBCFJRedist_AIO_x86_x64
DL_ARCH[18]="X86"
DL_WINST_NAME[18]=RicktendoAioExe
-# General Runtimes
-DL_FILE[19]="Geos_One_General_Runtimes_Installer_${GENERALVERSION}.msi"
-DL_SOURCE[19]="http://ftp.disconnected-by-peer.at/AIO/Geos_One_General_Runtimes_Installer_${GENERALVERSION}.msi"
+# The DL_FILE[19] - DL_FILE[22] is also used in the builder-target-cb.sh
+# if you change also change there
+DL_FILE[19]="dotNetFx40_Full_x86_x64_Slim_${RICKTENDONET}.exe"
+DL_SOURCE[19]="http://brianspcrepair.com/ricktendo/Setup/dotNetFx40_Full_x86_x64_Slim.exe"
DL_ARCH[19]="X86"
-DL_WINST_NAME[19]=InstallGeneralMsi
+DL_WINST_NAME[19]=RicktendoNet40Exe
+
+DL_FILE[20]="dotNetFx40LP_Full_x86_x64de_Slim_${RICKTENDONET}.7z"
+DL_SOURCE[20]="http://brianspcrepair.com/ricktendo/Archive/LP/dotNetFx40LP_Full_x86_x64de_Slim.7z"
+DL_ARCH[20]="X86"
+DL_WINST_NAME[20]=RicktendoNet40Lang
+
+DL_FILE[21]="dotNetFx45_Full_x86_x64_Slim_${RICKTENDONET}.exe"
+DL_SOURCE[21]="http://brianspcrepair.com/ricktendo/Setup/dotNetFx45_Full_x86_x64_Slim.exe"
+DL_ARCH[21]="X86"
+DL_WINST_NAME[21]=Ricktendo45Exe
+
+DL_FILE[22]="dotNetFx45LP_Full_x86_x64de_Slim_${RICKTENDONET}.7z"
+DL_SOURCE[22]="http://brianspcrepair.com/ricktendo/Archive/LP/dotNetFx45LP_Full_x86_x64de_Slim.7z"
+DL_ARCH[22]="X86"
+DL_WINST_NAME[22]=RicktendoNet45Lang
+
+# General Runtimes
+DL_FILE[23]="Geos_One_General_Runtimes_Installer_${GENERALVERSION}.msi"
+DL_SOURCE[23]="http://ftp.disconnected-by-peer.at/AIO/Geos_One_General_Runtimes_Installer_${GENERALVERSION}.msi"
+DL_ARCH[23]="X86"
+DL_WINST_NAME[23]=InstallGeneralMsi
##################
### Uninstallers
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 4abb912..63814cc 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -115,11 +115,9 @@ function create() {
done
# ==========================================================================================================
-# Replace the General Runtimes with the Msi version fo GeosOne
+# Replace the General Runtimes with the Msi version off GeosOne
# ==========================================================================================================
- # Unlocker loads a kernel driver to find out the locking programms and forces them to spawn to memeory so that the lock gets removed and the file can be deleted
- # so we need to load the right unlocker for the arch x86 or x64
rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/*
mv -v $INST_DIR/CLIENT_DATA/GeosOne_BR_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/package.xml
@@ -160,8 +158,8 @@ function create() {
if [ "$FLASHUPDATE" = "1" ]; then
rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Flash/*.exe
- cp $INST_DIR/CLIENT_DATA/X86/install_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player.exe
- cp $INST_DIR/CLIENT_DATA/X86/install_flash_player_ax-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player_ax.exe
+ mv $INST_DIR/CLIENT_DATA/X86/install_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player.exe
+ mv $INST_DIR/CLIENT_DATA/X86/install_flash_player_ax-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player_ax.exe
sed "s!..\..\....\....!${FLASHVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
sed "s!.._._..._...!${FLASHVERSION//./_}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
fi
@@ -174,7 +172,7 @@ function create() {
if [ "$SHOCKUPDATE" = "1" ]; then
rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/*.msi
- cp $INST_DIR/CLIENT_DATA/X86/sw_lic_full_installer-${SHOCKVERSION}.msi $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/sw_lic_full_installer.msi
+ mv $INST_DIR/CLIENT_DATA/X86/sw_lic_full_installer-${SHOCKVERSION}.msi $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/sw_lic_full_installer.msi
sed "s!..\..\..r...!${SHOCKVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
sed "s!v12!v${SHOCKVERSION//r/.}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
fi
@@ -185,14 +183,14 @@ function create() {
if [ "$SILVERUPDATE" = "1" ]; then
rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/*.exe
- cp $INST_DIR/CLIENT_DATA/X86/Silverlight-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight.exe
- cp $INST_DIR/CLIENT_DATA/X86/Silverlight_x64-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight_x64.exe
+ mv $INST_DIR/CLIENT_DATA/X86/Silverlight-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight.exe
+ mv $INST_DIR/CLIENT_DATA/X86/Silverlight_x64-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight_x64.exe
sed "s!.\..\......\..!${SILVERVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml
sed "s!v5!v${SILVERVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml
fi
# ==========================================================================================================
-# Update MSCV & J/F Sharp
+# Update MSCV & J Sharp and add F Sharp
# ==========================================================================================================
if [ "$RICKTENDOMSVCUPDATE" = "1" ]; then
@@ -208,13 +206,40 @@ function create() {
fi
if [ "$RICKTENDOJSHARPUPDATE" = "1" ]; then
- rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/*
- mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/*sharp $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/
+ rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/jsredist
+ mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/vjsharp $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/
mv -v $INST_DIR/CLIENT_DATA/Ricktendo_JS_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/jsredist/package.xml
else
rm $INST_DIR/CLIENT_DATA/Ricktendo_JS_package.xml
fi
+ mv $INST_DIR/CLIENT_DATA/X86/Ricktendo/fsharp $INST_DIR/CLIENT_DATA/Install/Packages/fsredist/
+ mv -v $INST_DIR/CLIENT_DATA/Ricktendo_FS_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/fsredist/package.xml
+ sed 's/.*<\/settings>.*/\t\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
+
+
+# ==========================================================================================================
+# Update .NET 4.0 & 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[19]}
+ #7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.0 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[20]}
+ 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/*
+ 7z x -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[21]}
+ #7z x -y -o$INST_DIR/CLIENT_DATA/Install/NET/4.5 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[22]}
+ 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
+ fi
+
# ==========================================================================================================
# move the uninstallers in place (directory layout like the sereby package)
# ==========================================================================================================
@@ -232,6 +257,12 @@ function create() {
mv -v $INST_DIR/CLIENT_DATA/opsi-WinPKG.exe $INST_DIR/CLIENT_DATA/Install/
+# ==========================================================================================================
+# Correct linefeed in config
+# ==========================================================================================================
+
+ unix2dos $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
+
# ==========================================================================================================
# Create a new sereby aio pack
# ==========================================================================================================
@@ -285,6 +316,8 @@ function create() {
# Disable zlib1.dll warning General Runtimes
# ==========================================================================================================
+ # Unlocker loads a kernel driver to find out the locking programms and forces them to spawn to memeory so that the lock gets removed and the file can be deleted
+ # so we need to load the right unlocker for the arch x86 or x64
# move the Portbale Unlocker in Place
mv -v $INST_DIR/CLIENT_DATA/X86/Unlocker $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp32.bat
diff --git a/dotNetFx40LP_Full_x86_x64de_Slim_2013.8.15.7z.sha1sum b/dotNetFx40LP_Full_x86_x64de_Slim_2013.8.15.7z.sha1sum
new file mode 100644
index 0000000..d1c5a9e
--- /dev/null
+++ b/dotNetFx40LP_Full_x86_x64de_Slim_2013.8.15.7z.sha1sum
@@ -0,0 +1 @@
+72f33ba4874da23777bd004841b7ed989a721311 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/dotNetFx40LP_Full_x86_x64de_Slim_2013.8.15.7z
diff --git a/dotNetFx40_Full_x86_x64_Slim_2013.8.15.exe.sha1sum b/dotNetFx40_Full_x86_x64_Slim_2013.8.15.exe.sha1sum
new file mode 100644
index 0000000..7a8fb50
--- /dev/null
+++ b/dotNetFx40_Full_x86_x64_Slim_2013.8.15.exe.sha1sum
@@ -0,0 +1 @@
+52cf80d4c20de96811af353eb3ffe5f7239978ef /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/dotNetFx40_Full_x86_x64_Slim_2013.8.15.exe
diff --git a/dotNetFx45LP_Full_x86_x64de_Slim_2013.8.15.7z.sha1sum b/dotNetFx45LP_Full_x86_x64de_Slim_2013.8.15.7z.sha1sum
new file mode 100644
index 0000000..ac11cdd
--- /dev/null
+++ b/dotNetFx45LP_Full_x86_x64de_Slim_2013.8.15.7z.sha1sum
@@ -0,0 +1 @@
+948b044ab65836012a59e919b691119652c3e031 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/dotNetFx45LP_Full_x86_x64de_Slim_2013.8.15.7z
diff --git a/dotNetFx45_Full_x86_x64_Slim_2013.8.15.exe.sha1sum b/dotNetFx45_Full_x86_x64_Slim_2013.8.15.exe.sha1sum
new file mode 100644
index 0000000..6f8de7c
--- /dev/null
+++ b/dotNetFx45_Full_x86_x64_Slim_2013.8.15.exe.sha1sum
@@ -0,0 +1 @@
+1af50ab03603c932eb8f9add382c04f8f222ce3c /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/dotNetFx45_Full_x86_x64_Slim_2013.8.15.exe
diff --git a/sw_lic_full_installer-12.0.3r133.msi.sha1sum b/sw_lic_full_installer-12.0.3r133.msi.sha1sum
index 48d642d..4a192ae 100644
--- a/sw_lic_full_installer-12.0.3r133.msi.sha1sum
+++ b/sw_lic_full_installer-12.0.3r133.msi.sha1sum
@@ -1 +1 @@
-d6168a4beeee97165f6aa7c5a959d7799b2edc9f /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/sw_lic_full_installer-12.0.3r133.msi
+d6168a4beeee97165f6aa7c5a959d7799b2edc9f /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.2/X86/sw_lic_full_installer-12.0.3r133.msi