diff --git a/CLIENT_DATA/delsub32.opsiscript b/CLIENT_DATA/delsub32.opsiscript new file mode 100644 index 0000000..bbd51bf --- /dev/null +++ b/CLIENT_DATA/delsub32.opsiscript @@ -0,0 +1,98 @@ +; Copyright (c) uib gmbh (www.uib.de) +; This sourcecode is owned by uib gmbh +; and published under the Terms of the General Public License. +; credits: http://www.opsi.org/en/credits/ + +Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallExecutable$ +Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" + +if FileExists($IniFile$) + Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","") + Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","") + Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","") + Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..." +else + Message "Uninstalling " + $ProductId$ + " ..." +endif + +if FileExists($IniFile$) + Set $UninstallExecutable$ = GetValueFromInifile($IniFile$,"X86","UninstallExecutable","XXXXXXXX.exe") + Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallExecutable$ + if FileExists($UninstallProgramOld$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_old + sub_check_exitcode + endif +endif +if FileExists($UninstallProgram$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall + sub_check_exitcode +endif + +comment "Delete files" +Files_uninstall /32Bit + +comment "Cleanup registry" +Registry_uninstall /32Bit + +comment "Delete program shortcuts" +LinkFolder_uninstall + +[Winbatch_uninstall_old] +"$UninstallProgramOld$" /InstallType:MACHINE + +[Winbatch_uninstall] +"$UninstallProgram$" /InstallType:MACHINE + +[Files_uninstall] +; Example for recursively deleting the installation directory: +; +; del -sf "$InstallDir$\" + +[Registry_uninstall] +; Example of deleting a registry key: +; +; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$] + +[LinkFolder_uninstall] +; Example of deleting a folder from AllUsers startmenu: +; +; set_basefolder common_programs +; delete_subfolder $ProductId$ +; +; Example of deleting a shortcut from AllUsers desktop: +; +; set_basefolder common_desktopdirectory +; set_subfolder "" +; delete_element $ProductId$ + +[Sub_check_exitcode] +comment "Test for installation success via exit code" +set $ExitCode$ = getLastExitCode +; informations to exit codes see +; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx +; http://msdn.microsoft.com/en-us/library/aa368542.aspx +if ($ExitCode$ = "0") + comment "Looks good: setup program gives exitcode zero" +else + comment "Setup program gives a exitcode unequal zero: " + $ExitCode$ + if ($ExitCode$ = "1605") + comment "ERROR_UNKNOWN_PRODUCT 1605 This action is only valid for products that are currently installed." + comment "Uninstall of a not installed product failed - no problem" + else + if ($ExitCode$ = "1641") + comment "looks good: setup program gives exitcode 1641" + comment "ERROR_SUCCESS_REBOOT_INITIATED 1641 The installer has initiated a restart. This message is indicative of a success." + else + if ($ExitCode$ = "3010") + comment "looks good: setup program gives exitcode 3010" + comment "ERROR_SUCCESS_REBOOT_REQUIRED 3010 A restart is required to complete the install. This message is indicative of a success." + else + logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$ + isFatalError + endif + endif + endif +endif + diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins deleted file mode 100644 index da4c4ae..0000000 --- a/CLIENT_DATA/delsub3264.ins +++ /dev/null @@ -1,141 +0,0 @@ -; Copyright (c) uib gmbh (www.uib.de) -; This sourcecode is owned by uib gmbh -; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/en/credits/ - - -Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$ -Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" - -Set $UninstallProgram64$ = $InstallDir64$ + "\" + $UninstallProg64$ -Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini" - -if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") - if FileExists($IniFile32$) - Set $OLD_VERSION$ = GetValueFromInifile($IniFile32$,"COMMON","VERSION","") - Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile32$,"COMMON","CREATOR_TAG","") - Set $OLD_RELEASE$ = GetValueFromInifile($IniFile32$,"COMMON","RELEASE","") - endif - Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..." - - if FileExists($IniFile32$) - Set $UninstallProg32$ = GetValueFromInifile($IniFile32$,"X86","UninstallProg32","XXXXXXXX.exe") - Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ - if FileExists($UninstallProgramOld32$) - comment "Uninstall program found, starting uninstall" - Winbatch_uninstall_old_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10 - sub_check_exitcode - endif - endif - if FileExists($UninstallProgram32$) - comment "Uninstall program found, starting uninstall" - Winbatch_uninstall_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10 - sub_check_exitcode - endif - - comment "Delete files" - Files_uninstall_32 /32Bit - comment "Cleanup registry" - Registry_uninstall /32Bit -endif - -if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) - if FileExists($IniFile64$) - Set $OLD_VERSION$ = GetValueFromInifile($IniFile64$,"COMMON","VERSION","") - Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile64$,"COMMON","CREATOR_TAG","") - Set $OLD_RELEASE$ = GetValueFromInifile($IniFile64$,"COMMON","RELEASE","") - endif - Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..." - - if FileExists($IniFile64$) - Set $UninstallProg64$ = GetValueFromInifile($IniFile64$,"X86_64","UninstallProg64","XXXXXXXX.exe") - Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$ - if FileExists($UninstallProgramOld64$) - comment "Uninstall program found, starting uninstall" - Winbatch_uninstall_old_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10 - sub_check_exitcode - endif - endif - if FileExists($UninstallProgram64$) - comment "Uninstall program found, starting uninstall" - Winbatch_uninstall_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10 - sub_check_exitcode - endif - - comment "Delete files" - Files_uninstall_64 /64Bit - comment "Cleanup registry" - Registry_uninstall /64Bit -endif - -comment "Delete program shortcuts" -LinkFolder_uninstall - -[Winbatch_uninstall_old_32] -"$UninstallProgramOld32$" /S - -[Winbatch_uninstall_32] -"$UninstallProgram32$" /S - -[Files_uninstall_32] -; Example for recursively deleting the installation directory (don't forget the trailing backslash): -; -delete -sf "$InstallDir32$\" - -[Winbatch_uninstall_old_64] -"$UninstallProgramOld64$" /S - -[Winbatch_uninstall_64] -"$UninstallProgram64$" /S - -[Files_uninstall_64] -; Example for recursively deleting the installation directory: -; -del -sf "$InstallDir64$\" - -[Registry_uninstall] -; Example of deleting a registry key: -; -; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$] - -[LinkFolder_uninstall] -; Example of deleting a folder from AllUsers startmenu: -; -; set_basefolder common_programs -; delete_subfolder $ProductId$ -; -; Example of deleting a shortcut from AllUsers desktop: -; -; set_basefolder common_desktopdirectory -; set_subfolder "" -; delete_element $ProductId$ - -[Sub_check_exitcode] -comment "Test for installation success via exit code" -set $ExitCode$ = getLastExitCode -; informations to exit codes see -; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx -; http://msdn.microsoft.com/en-us/library/aa368542.aspx -if ($ExitCode$ = "0") - comment "Looks good: setup program gives exitcode zero" -else - comment "Setup program gives a exitcode unequal zero: " + $ExitCode$ - if ($ExitCode$ = "1605") - comment "ERROR_UNKNOWN_PRODUCT 1605 This action is only valid for products that are currently installed." - comment "Uninstall of a not installed product failed - no problem" - else - if ($ExitCode$ = "1641") - comment "looks good: setup program gives exitcode 1641" - comment "ERROR_SUCCESS_REBOOT_INITIATED 1641 The installer has initiated a restart. This message is indicative of a success." - else - if ($ExitCode$ = "3010") - comment "looks good: setup program gives exitcode 3010" - comment "ERROR_SUCCESS_REBOOT_REQUIRED 3010 A restart is required to complete the install. This message is indicative of a success." - else - logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$ - isFatalError - endif - endif - endif -endif - diff --git a/CLIENT_DATA/login.ins b/CLIENT_DATA/login.opsiscript similarity index 100% rename from CLIENT_DATA/login.ins rename to CLIENT_DATA/login.opsiscript diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup32.opsiscript similarity index 60% rename from CLIENT_DATA/setup3264.ins rename to CLIENT_DATA/setup32.opsiscript index be46e11..ebcf344 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup32.opsiscript @@ -4,31 +4,23 @@ ; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.11.2.6" +requiredWinstVersion >= "4.11.4.6" +ScriptErrorMessages=off -DefVar $UninstallProgram32$ -DefVar $UninstallProgramOld32$ -DefVar $IniFile32$ -DefVar $UninstallProgram64$ -DefVar $UninstallProgramOld64$ -DefVar $IniFile64$ +DefVar $UninstallProgram$ +DefVar $UninstallProgramOld$ +DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ProductId$ DefVar $MinimumSpace$ -DefVar $InstallDir32$ -DefVar $InstallDir64$ +DefVar $InstallDir$ DefVar $ExitCode$ -DefVar $INST_SystemType$ -DefVar $INST_architecture$ DefVar $OLD_VERSION$ DefVar $OLD_CREATOR_TAG$ DefVar $OLD_RELEASE$ -Set $INST_SystemType$ = GetSystemType -set $INST_architecture$ = GetProductProperty("install_architecture","system specific") - -Set $LogDir$ = "%SystemDrive%\tmp" +Set $LogDir$ = "%opsiLogDir%" ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; and adds the following variables: @@ -43,87 +35,60 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -;$ProductId$ should be the name of the product in opsi +; $ProductId$ should be the name of the product in opsi ; therefore please: only lower letters, no umlauts, ; no white space use '-' as a seperator -Set $MinimumSpace$ = "50 MB" +Set $MinimumSpace$ = "30 MB" ; the path were we find the product after the installation -;Set $InstallDir32$ = "%ProgramFiles32Dir%\" -;Set $InstallDir64$ = "%ProgramFiles64Dir%\" -Set $InstallDir32$ = "%CommonAppdataDir%\Dropbox" -Set $InstallDir64$ = "%CommonAppdataDir%\Dropbox" +Set $InstallDir$ = "%ProgramFiles32Dir%\Dropbox\Client" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ - isFatalError + isFatalError "No Space" ; Stop process and set installation status to failed else comment "Show product picture" ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ - if FileExists("%ScriptPath%\delsub3264.ins") + if FileExists("%ScriptPath%\delsub32.opsiscript") comment "Start uninstall sub section" - Sub "%ScriptPath%\delsub3264.ins" + Sub "%ScriptPath%\delsub32.opsiscript" endif - comment "installing" - - if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") - Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." - comment "Start setup program" - ChangeDirectory "%SCRIPTPATH%" - Winbatch_install_32 - Sub_check_exitcode - comment "Copy files" - Files_install_32 /32Bit - comment "Patch Registry" - Registry_install /32Bit - comment "Create shortcuts" - LinkFolder_install - endif - - if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) - Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." - comment "Start setup program" - ChangeDirectory "%SCRIPTPATH%" - Winbatch_install_64 - Sub_check_exitcode - comment "Copy files" - Files_install_64 /64Bit - comment "Patch Registry" - Registry_install /64Bit - comment "Create shortcuts" - LinkFolder_install - endif + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." + + comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" + Winbatch_install + Sub_check_exitcode + + comment "Copy files" + Files_install /32Bit + + comment "Patch Registry" + Registry_install /32Bit + + comment "Create shortcuts" + LinkFolder_install + + comment "File Type Association" + DosInAnIcon_FileTypeAssoc_install endif -[Winbatch_install_32] -;"$Install32Exe$" /S /D="$InstallDir32$" /NOLAUNCH /InstallType:MACHINE -"$Install32Exe$" /S +[Winbatch_install] +"$InstallExe$" /S -[Files_install_32] +[Files_install] ; copy the ini file to the InstallDir -copy "$IniCfgFile$" "$InstallDir32$" +copy "$IniCfgFile$" "$InstallDir$" ; Example of recursively copying some files into the installation directory: ; -; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" - -[Winbatch_install_64] -;"$Install64Exe$" /S /D="$InstallDir64$" /NOLAUNCH /InstallType:MACHINE -"$Install64Exe$" /S - -[Files_install_64] -; copy the ini file to the InstallDir -copy "$IniCfgFile$" "$InstallDir64$" - -; Example of recursively copying some files into the installation directory: -; -; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$" +; copy -s "%ScriptPath%\files\*.*" "$InstallDir$" [Registry_install] ; Example of setting some values of an registry key: @@ -134,6 +99,10 @@ copy "$IniCfgFile$" "$InstallDir64$" ; set "name3" = REG_BINARY:00 af 99 cd [LinkFolder_install] +set_basefolder common_desktopdirectory +set_subfolder "" +delete_element "$NAME$" + ; Example of deleting a folder from AllUsers startmenu: ; ; set_basefolder common_programs @@ -146,7 +115,7 @@ copy "$IniCfgFile$" "$InstallDir64$" ; ; set_link ; name: $ProductId$ -; target: +; target: $InstallDir$\$ProgramExecutable$ ; parameters: ; working_dir: $InstallDir$ ; icon_file: @@ -160,13 +129,24 @@ copy "$IniCfgFile$" "$InstallDir64$" ; ; set_link ; name: $ProductId$ -; target: +; target: $InstallDir$\$ProgramExecutable$ ; parameters: ; working_dir: $InstallDir$ ; icon_file: ; icon_index: 2 ; end_link +[DosInAnIcon_FileTypeAssoc_install] +; Requires danysys.sfta +; Sample Usage: +; Set Acrobat Reader DC as Default .pdf reader: +; +; SFTA AcroExch.Document.DC .pdf +; +; Set Sumatra PDF as Default .pdf reader: +; +; SFTA Applications\SumatraPDF.exe .pdf + [Sub_check_exitcode] comment "Test for installation success via exit code" set $ExitCode$ = getLastExitCode diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall32.opsiscript similarity index 61% rename from CLIENT_DATA/uninstall3264.ins rename to CLIENT_DATA/uninstall32.opsiscript index de217d2..d1a35de 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall32.opsiscript @@ -4,32 +4,22 @@ ; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.11.2.6" +requiredWinstVersion >= "4.11.4.6" +ScriptErrorMessages=off -DefVar $UninstallProg32$ -DefVar $UninstallProgram32$ -DefVar $UninstallProgramOld32$ -DefVar $IniFile32$ -DefVar $UninstallProg64$ -DefVar $UninstallProgram64$ -DefVar $UninstallProgramOld64$ -DefVar $IniFile64$ +DefVar $UninstallProgram$ +DefVar $UninstallProgramOld$ +DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ -DefVar $InstallDir32$ -DefVar $InstallDir64$ -DefVar $INST_SystemType$ -DefVar $INST_architecture$ +DefVar $InstallDir$ DefVar $OLD_VERSION$ DefVar $OLD_CREATOR_TAG$ DefVar $OLD_RELEASE$ -Set $INST_SystemType$ = GetSystemType -set $INST_architecture$ = GetProductProperty("install_architecture","system specific") - -Set $LogDir$ = "%SystemDrive%\tmp" +Set $LogDir$ = "%opsiLogDir%" ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; and adds the following variables: @@ -44,10 +34,7 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -;Set $InstallDir32$ = "%ProgramFiles32Dir%\" -;Set $InstallDir64$ = "%ProgramFiles64Dir%\" -Set $InstallDir32$ = "%CommonAppdataDir%\Dropbox" -Set $InstallDir64$ = "%CommonAppdataDir%\Dropbox" +Set $InstallDir$ = "%ProgramFiles32Dir%\Dropbox\Client" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" @@ -57,8 +44,8 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." -if FileExists("%ScriptPath%\delsub3264.ins") +if FileExists("%ScriptPath%\delsub32.opsiscript") comment "Start uninstall sub section" - Sub "%ScriptPath%\delsub3264.ins" + Sub "%ScriptPath%\delsub32.opsiscript" endif diff --git a/OPSI/control b/OPSI/control index d3f60e3..b6bf624 100644 --- a/OPSI/control +++ b/OPSI/control @@ -13,27 +13,23 @@ version: 4.0.2 priority: 0 licenseRequired: False productClasses: -setupScript: setup3264.ins -uninstallScript: uninstall3264.ins +setupScript: setup32.opsiscript +uninstallScript: uninstall32.opsiscript updateScript: alwaysScript: onceScript: customScript: userLoginScript: -[ProductProperty] -type: unicode -name: install_architecture -multivalue: False -editable: False -description: which architecture (32/64 bit) has to be installed -values: ["32 only", "64 only", "both", "system specific"] -default: ["system specific"] - [ProductDependency] action: setup requiredProduct: sereby.aio requiredStatus: installed requirementType: before +[ProductDependency] +action: setup +requiredProduct: danysys.sfta +requiredStatus: installed +requirementType: before diff --git a/builder-product.cfg b/builder-product.cfg index 8e2637e..fd3f34b 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -1,6 +1,6 @@ VENDOR="dropbox.com" PN="dropbox.client" -NAME="DropBox Client" +NAME="Dropbox" DESCRIPTION="Dropbox online snyc tool" VERSION="81.4.195" RELEASE="3" @@ -18,22 +18,20 @@ DL_FILE[1]="Dropbox-${VERSION}-Offline-Installer.exe" DL_SOURCE[1]="https://www.dropbox.com/download?full=1&plat=win" #DL_SOURCE[1]="https://clientupdates.dropboxstatic.com/dbx-releng/client/Dropbox%20${VERSION}%20Offline%20Installer.exe" DL_ARCH[1]="X86" -DL_WINST_NAME[1]=Install32Exe - -DL_FILE[2]="Dropbox-${VERSION}-Offline-Installer.exe" -DL_SOURCE[2]="https://www.dropbox.com/download?full=1&plat=win" -#DL_SOURCE[2]="https://clientupdates.dropboxstatic.com/dbx-releng/client/Dropbox%20${VERSION}%20Offline%20Installer.exe" -DL_ARCH[2]="X86_64" -DL_WINST_NAME[2]=Install64Exe +DL_WINST_NAME[1]=InstallExe # File array index for the image showing while installing the program ICON_DL_INDEX=0 +####################################### +# specify Executable for Desktop link +####################################### + +on 32bit or 64bit packages +WINST_NAME[0]="ProgramExecutable" +WINST_VALUE[0]="Dropbox.exe" + OPSI_INI_SECTION[0]="X86" -OPSI_INI_OPTION[0]="UninstallProg32" +OPSI_INI_OPTION[0]="UninstallExecutable" OPSI_INI_VALUE[0]="DropboxUninstaller.exe" -OPSI_INI_SECTION[1]="X86_64" -OPSI_INI_OPTION[1]="UninstallProg64" -OPSI_INI_VALUE[1]="DropboxUninstaller.exe" -