diff --git a/builder-product.cfg b/builder-product.cfg index 60e48dc..d7110af 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -117,6 +117,12 @@ DL_SOURCE[16]="http://download.microsoft.com/download/B/3/C/B3CF6815-40B1-4E36-8 DL_ARCH[16]="X86" DL_WINST_NAME[16]=InstallSilver64Exe +DL_FILE[17]="unlocker1.9.0-portable.zip" +DL_SOURCE[17]="file:///home/mario/Downloads/unlocker1.9.0-portable.zip" +DL_ARCH[17]="X86" +DL_EXTRACT_TO[17]="Unlocker" +DL_EXTRACT_FORMAT[17]="7zip" + ################## ### Uninstallers ################## diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index c5c69c9..0a67aa8 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -42,7 +42,7 @@ function create() { builder_create # create directories and extract the runtime packages - mkdir -p $INST_DIR/CLIENT_DATA/{Install/Packages/Air,Config} + 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/svcpack/aio-runtimes.exe @@ -54,6 +54,9 @@ function create() { # move the Windows 8 dotnet 2 - 3.5 in place mv -v $INST_DIR/CLIENT_DATA/X86/win8xdotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET/WIN8.X + # move the Portbale Unlocker in Place + mv -v $INST_DIR/CLIENT_DATA/X86/Unlocker $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/ + # 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 @@ -116,11 +119,16 @@ function create() { # sed force update on flash sed -e "s!-install!-force -install!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml - # Workaround the update bug of the sereby Basic Runtimes - echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp.bat - echo "del /f /q %WINDIR%\System32\zlib1.dll" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp.bat - echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp.bat - sed 's/.*\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/package.xml + # Workaround update bugs of the sereby Basic 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 + echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp32.bat + echo "%~dp0\Unlocker\x86\Unlocker.exe %WINDIR%\System32\zlib1.dll /D /S" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp32.bat + echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp32.bat + echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp64.bat + echo "%~dp0\Unlocker\x64\Unlocker.exe %WINDIR%\System32\zlib1.dll /D /S" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp64.bat + echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/CleanUp64.bat + sed 's/.*\t\t\n\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/BasicRuntimes/package.xml # Move Adobe Air and sereby config in place mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-8_win.exe diff --git a/unlocker1.9.0-portable.zip.sha1sum b/unlocker1.9.0-portable.zip.sha1sum new file mode 100644 index 0000000..9bc8c46 --- /dev/null +++ b/unlocker1.9.0-portable.zip.sha1sum @@ -0,0 +1 @@ +e8abf005d2f7658f81b1ed29a0c426f9a63637f2 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/unlocker1.9.0-portable.zip