diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 61e9115..b71ae00 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -108,13 +108,13 @@ else endif [DosInAnIcon_path] -%ScriptPath%\short.bat %ProgramFiles32Dir% +%ScriptPath%\short.bat "%ProgramFiles32Dir%" [DosInAnIcon_license] -inifile $LogDir$\$ProductId$\Abcpy.ini [OEM Install] SERIALNUMBER="$Licensekey$" -inifile $LogDir$\$ProductId$\Abcpy.ini [OEM Install] USERNAME="%PCName%" -inifile $LogDir$\$ProductId$\Abcpy.ini [OEM Install] COMPANYNAME="%IPName%" -inifile $LogDir$\$ProductId$\Abcpy.ini [OEM Install] INSTALLDIR="$InstallDir$" +inifile $LogDir$\$ProductId$\Abcpy.ini [OEM Install] SERIALNUMBER=$Licensekey$ +inifile $LogDir$\$ProductId$\Abcpy.ini [OEM Install] USERNAME=%PCName% +inifile $LogDir$\$ProductId$\Abcpy.ini [OEM Install] COMPANYNAME=%IPName% +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 @@ -125,7 +125,7 @@ msiexec /i "$LogDir$\$ProductId$\stock photography\Adobe Stock Photos 1.0.msi" / ; "$LogDir$\$ProductId$\setup.exe" /s /v /qn [Winbatch_update] -"$Install902Exe$" /s +"$Install902Exe$" -s [Files_delete] del -sf "$LogDir$\$ProductId$\" @@ -142,12 +142,12 @@ copy "$IniCfgFile$" "$InstallDir$" ; copy -s "%ScriptPath%\files\*.*" "$InstallDir$\" [Registry_install] -; Example of setting some values of an registry key: -; -; openkey [HKEY_LOCAL_MACHINE\Software\$ProductId$] -; set "name1" = "some string value" -; set "name2" = REG_DWORD:0001 -; set "name3" = REG_BINARY:00 af 99 cd +; Disable Registry window +openkey [HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\Adobe PhotoshopCS2 - $MsiId$ +set "EPIC_REGS_TYPE" = REG_DWORD:00000004 +set "EPIC_REGS_STATE" = REG_DWORD:00000002 +set "EPIC_REGS_LANG" = REG_DWORD:00000000 +set "EPIC_REGS_COUNT" = REG_DWORD:00000000 [LinkFolder_install] ; Example of deleting a folder from AllUsers startmenu: diff --git a/builder-product.cfg b/builder-product.cfg index 1a0d84f..285006e 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -28,6 +28,18 @@ DL_SOURCE[2]="http://download.adobe.com/pub/adobe/photoshop/win/cs2/ps902.exe" DL_ARCH[2]="X86" DL_EXTRACT_FORMAT[2]="7zip" +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_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/bridge" + # File array index for the image showing while installing the program ICON_DL_INDEX=0 diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index bdd44f8..141e78d 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -29,6 +29,9 @@ function create() { builder_create mv $INST_DIR/CLIENT_DATA/X86/Temp/Adobe\(R\)\ Photoshop\(R\)\ CS2 $INST_DIR/CLIENT_DATA/X86/Core + rm -rf $INST_DIR/CLIENT_DATA/X86/Core/bridge + mv $INST_DIR/CLIENT_DATA/X86/Temp/bridge $INST_DIR/CLIENT_DATA/X86/Core/bridge + mv $INST_DIR/CLIENT_DATA/setup.iss $INST_DIR/CLIENT_DATA/X86/Updater rm -rf $INST_DIR/CLIENT_DATA/X86/Temp }