go-opsi
/
adobe.photoshopcs2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use the Short only on Programm Path

This commit is contained in:
Mario Fetka 2013-09-21 08:29:11 +02:00
parent f910f5abdc
commit 0b3d339ce5
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CLIENT_DATA/setup32.ins
View File

@ -26,6 +26,11 @@ set $languageInfo$ = getLocaleInfoMap
DefVar $LanguageId$
set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
DefStringList $ShortProgramFiles32List$
$ShortProgramFiles32List$ = getOutStreamFromSection ('DosInAnIcon_path')
DefVar $ShortProgramFiles32Dir$
set $ShortProgramFiles32Dir$ = takeString (-1, $ShortProgramFiles32List$)
Set $LogDir$ = "%SystemDrive%\tmp"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@ -46,16 +51,13 @@ Set $LogDir$ = "%SystemDrive%\tmp"
; no white space use '-' as a seperator
Set $MinimumSpace$ = "600 MB"
; the path were we find the product after the installation
Set $InstallDir$ = "%ProgramFiles32Dir%\Adobe\Acrobat 8.0"
Set $InstallDir$ = "%ShortProgramFiles32Dir%\Adobe\Adobe Photoshop CS2"
Set $LicenseRequired$ = "true"
Set $LicensePool$ = "p_" + $ProductId$
; ----------------------------------------------------------------
Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
DefStringList $ShortInstallDir$
$ShortInstallDir$ = getOutStreamFromSection ('DosInAnIcon_path')
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
isFatalError "No Space"
@ -96,10 +98,10 @@ else
endif
[DosInAnIcon_path]
"%ScriptPath%\short.bat $InstallDir$
"%ScriptPath%\short.bat $ProgramFiles32Dir$
[Winbatch_install]
msiexec /i "$Install90Msi$"" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! EULA_ACCEPT=YES SERIALNUMBER="$Licensekey$" USERNAME="%PCName%" COMPANYNAME="%IPName%" INSTALLDIR="$ShortInstallDir$" ALLUSERS=1 REBOOT=ReallySuppress
msiexec /i "$Install90Msi$"" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! EULA_ACCEPT=YES SERIALNUMBER="$Licensekey$" USERNAME="%PCName%" COMPANYNAME="%IPName%" INSTALLDIR="$InstallDir$" ALLUSERS=1 REBOOT=ReallySuppress
; "$Install90Msi$" /rs /sPB /l /sl "1031" /msi EULA_ACCEPT=YES SERIALNUMBER="$Licensekey$" USERNAME="%PCName%" COMPANYNAME="%IPName%" INSTALLDIR="$InstallDir$" ALLUSERS=1
[Winbatch_update]

2
CLIENT_DATA/uninstall32.ins
View File

@ -34,7 +34,7 @@ Set $LogDir$ = "%SystemDrive%\tmp"
; ----------------------------------------------------------------
; - Please edit the following values -
; ----------------------------------------------------------------
Set $InstallDir$ = "%ProgramFiles32Dir%\Adobe\Acrobat 8.0"
Set $InstallDir$ = "%ProgramFiles32Dir%\Adobe\Adobe Photoshop CS2"
Set $LicenseRequired$ = "true"
Set $LicensePool$ = "p_" + $ProductId$
; ----------------------------------------------------------------