diff --git a/CLIENT_DATA/Adobe Photoshop CS2 9.0.2.msp b/CLIENT_DATA/Adobe Photoshop CS2 9.0.2.msp new file mode 100644 index 0000000..5c8ed82 Binary files /dev/null and b/CLIENT_DATA/Adobe Photoshop CS2 9.0.2.msp differ diff --git a/CLIENT_DATA/Adobe Photoshop CS2.mst b/CLIENT_DATA/Adobe Photoshop CS2.mst new file mode 100644 index 0000000..079b645 Binary files /dev/null and b/CLIENT_DATA/Adobe Photoshop CS2.mst differ diff --git a/CLIENT_DATA/Adobe_Photoshop_CS2_9.0.2.mst b/CLIENT_DATA/Adobe_Photoshop_CS2_9.0.2.mst deleted file mode 100644 index 5e4e8c0..0000000 Binary files a/CLIENT_DATA/Adobe_Photoshop_CS2_9.0.2.mst and /dev/null differ diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 6f4616e..ac5afd1 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -91,9 +91,6 @@ else Winbatch_install Sub_check_exitcode - Winbatch_update - Sub_check_exitcode - Winbatch_update_bridge Sub_check_exitcode @@ -122,13 +119,11 @@ inifile $LogDir$\$ProductId$\Abcpy.ini [OEM Install] INSTALLDIR=$InstallDir$ [Winbatch_install] msiexec /i "$LogDir$\$ProductId$\commonfilesinstaller\Adobe Common File Installer.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress msiexec /i "$LogDir$\$ProductId$\help center\Adobe Help Center 1.0.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress -msiexec /i "$LogDir$\$ProductId$\Adobe Photoshop CS2.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress TRANSFORM=Adobe_Photoshop_CS2_9.0.2.mst +msiexec /i "$LogDir$\$ProductId$\Adobe Photoshop CS2.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress TRANSFORM="$LogDir$\$ProductId$\Adobe Photoshop CS2.mst" +msiexec /p "$LogDir$\$ProductId$\Adobe Photoshop CS2 9.0.2.msp" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress TRANSFORM="$LogDir$\$ProductId$\Adobe Photoshop CS2.mst" msiexec /i "$LogDir$\$ProductId$\bridge\Adobe Bridge 1.0.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress ; "$LogDir$\$ProductId$\setup.exe" /s /v /qn -[Winbatch_update] -"$Install902Exe$" -s - [Winbatch_update_bridge] "$UpdateBridge104Exe$" diff --git a/MultiProcessorSupport.zip.sha1sum b/MultiProcessorSupport.zip.sha1sum deleted file mode 100644 index 072cb08..0000000 --- a/MultiProcessorSupport.zip.sha1sum +++ /dev/null @@ -1 +0,0 @@ -eb1b7e565dddb926a42c58862de6f1493c7ba879 /home/mario/.opsi-dist-cache/adobe.photoshopcs2-9.0.2/X86/MultiProcessorSupport.zip diff --git a/builder-product.cfg b/builder-product.cfg index a02a83c..ad411af 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -23,29 +23,17 @@ DL_ARCH[1]="X86" DL_EXTRACT_FORMAT[1]="7zip" DL_EXTRACT_TO[1]="Temp" -DL_FILE[2]="ps902.exe" -DL_SOURCE[2]="http://download.adobe.com/pub/adobe/photoshop/win/cs2/ps902.exe" +DL_FILE[2]="Adobe_Bridge_1.0.3.zip" +DL_SOURCE[2]="http://download.adobe.com/pub/adobe/bridge/win/1.x/Adobe_Bridge_1.0.3.zip" DL_ARCH[2]="X86" -DL_EXTRACT_TO[2]="Temp" DL_EXTRACT_FORMAT[2]="7zip" +DL_EXTRACT_TO[2]="Temp/bridge" -DL_FILE[3]="Adobe_Bridge_1.0.3.zip" -DL_SOURCE[3]="http://download.adobe.com/pub/adobe/bridge/win/1.x/Adobe_Bridge_1.0.3.zip" +DL_FILE[3]="AdobeBridge_1.0.4_updater.exe" +DL_SOURCE[3]="http://download.adobe.com/pub/adobe/bridge/win/1.x/AdobeBridge_1.0.4_updater.exe" DL_ARCH[3]="X86" -DL_EXTRACT_FORMAT[3]="7zip" -DL_EXTRACT_TO[3]="Temp/bridge" - -DL_FILE[4]="AdobeBridge_1.0.4_updater.exe" -DL_SOURCE[4]="http://download.adobe.com/pub/adobe/bridge/win/1.x/AdobeBridge_1.0.4_updater.exe" -DL_ARCH[4]="X86" -DL_EXTRACT_FORMAT[4]="cp" -DL_EXTRACT_TO[4]="Updater" - -DL_FILE[5]="MultiProcessorSupport.zip" -DL_SOURCE[5]="ftp://ftp.adobe.com/pub/adobe/photoshop/win/cs2/MultiProcessorSupport.zip" -DL_ARCH[5]="X86" -DL_EXTRACT_FORMAT[5]="7zip" -DL_EXTRACT_TO[5]="Temp/MultiProcessor" +DL_EXTRACT_FORMAT[3]="cp" +DL_EXTRACT_TO[3]="Updater" # File array index for the image showing while installing the program diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index dcb1faa..aca2a70 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -33,19 +33,8 @@ function create() { rm -rf $INST_DIR/CLIENT_DATA/X86/Core/stock\ photography rm -rf $INST_DIR/CLIENT_DATA/X86/Core/bridge mv $INST_DIR/CLIENT_DATA/X86/Temp/bridge $INST_DIR/CLIENT_DATA/X86/Core/bridge - mkdir -p $INST_DIR/CLIENT_DATA/X86/Temp/Core - cabextract -d $INST_DIR/CLIENT_DATA/X86/Temp/Core $INST_DIR/CLIENT_DATA/X86/Core/Data1.cab - pushd $INST_DIR/CLIENT_DATA/X86/Temp/Updater - unshield x data1.cab - mv -vf App/honesty/Photoshop.exe $INST_DIR/CLIENT_DATA/X86/Temp/Core/Photoshop.exe - mv -vf App/AdobeXMP.dll $INST_DIR/CLIENT_DATA/X86/Temp/Core/AdobeXMP.dll - mv -vf Plug-ins/plug-ins/adobe_photoshop_only/automate/HDRMergeAuto.8li $INST_DIR/CLIENT_DATA/X86/Temp/Core/_FD1D92819EBF46FF92AC39DAF7FC6EBC - mv -vf Plug-ins/plug-ins/extensions/MMXCore.8BX $INST_DIR/CLIENT_DATA/X86/Temp/Core/_5F2B3A39CBEC4319B5D0C4FBD75C7014 - rm $INST_DIR/CLIENT_DATA/X86/Core/{*.exe,*.wri,Setup.ini} - popd - mv -vf $INST_DIR/CLIENT_DATA/X86/Temp/MultiProcessor/MultiProcessor\ Support.8BX $INST_DIR/CLIENT_DATA/X86/Temp/Core/_021C6307CEDB410187380C39E7D94594 - gcab -cvn $INST_DIR/CLIENT_DATA/X86/Core/Data1.cab $INST_DIR/CLIENT_DATA/X86/Temp/Core/* - mv $INST_DIR/CLIENT_DATA/Adobe_Photoshop_CS2_9.0.2.mst $INST_DIR/CLIENT_DATA/X86/Core/ + mv $INST_DIR/CLIENT_DATA/Adobe\ Photoshop\ CS2\ 9.0.2.msp $INST_DIR/CLIENT_DATA/X86/Core/ + mv $INST_DIR/CLIENT_DATA/Adobe\ Photoshop\ CS2.mst $INST_DIR/CLIENT_DATA/X86/Core/ rm -rf $INST_DIR/CLIENT_DATA/X86/Temp } diff --git a/ps902.exe.sha1sum b/ps902.exe.sha1sum deleted file mode 100644 index dccb716..0000000 --- a/ps902.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -8d8d146c254e2848d4a8816c9368e2cece69e48c /home/mario/.opsi-dist-cache/adobe.photoshopcs2-9.0.2/X86/ps902.exe