From 1f8b2b53c58a2c1f19ea487567ff9233a0c2cb4f Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 26 Sep 2019 18:29:02 +0200 Subject: [PATCH] Bump to new installer --- CLIENT_DATA/delsub32.ins | 112 ------- CLIENT_DATA/delsub3264.opsiscript | 178 +++++++++++ CLIENT_DATA/setup32.ins | 180 ----------- CLIENT_DATA/setup3264.opsiscript | 301 ++++++++++++++++++ ...install32.ins => uninstall3264.opsiscript} | 28 +- CamStudio-3.0-alpha.4-0.exe.sha1sum | 1 + CamStudio-Setup-2.7.2.rev326.exe.sha1sum | 1 - CamStudioCodec_1.5_Setup.exe.sha1sum | 1 - OPSI/control | 54 ++-- builder-product.cfg | 41 ++- 10 files changed, 557 insertions(+), 340 deletions(-) delete mode 100644 CLIENT_DATA/delsub32.ins create mode 100644 CLIENT_DATA/delsub3264.opsiscript delete mode 100644 CLIENT_DATA/setup32.ins create mode 100644 CLIENT_DATA/setup3264.opsiscript rename CLIENT_DATA/{uninstall32.ins => uninstall3264.opsiscript} (67%) create mode 100644 CamStudio-3.0-alpha.4-0.exe.sha1sum delete mode 100644 CamStudio-Setup-2.7.2.rev326.exe.sha1sum delete mode 100644 CamStudioCodec_1.5_Setup.exe.sha1sum diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins deleted file mode 100644 index ae873ee..0000000 --- a/CLIENT_DATA/delsub32.ins +++ /dev/null @@ -1,112 +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 $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$ -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","") -endif -Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..." - -if FileExists($IniFile$) - Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe") - Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ - if FileExists($UninstallProgramOld$) - comment "Uninstall program found, starting uninstall" - Winbatch_uninstall_old - sub_check_exitcode - sleepSeconds 1 - 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 - -DefVar $Property_CustomPostUninstall$ -Set $Property_CustomPostUninstall$ = getProductProperty("custom-post-uninstall","none") -if not ($Property_CustomPostUninstall$ = "none") - comment "Include custom post uninstall file" - if FileExists("%ScriptPath%\custom\" + $Property_CustomPostUninstall$) - sub_CustomPostUninstall - else - LogError "Include script NOT exists (" + $Property_CustomPostUninstall$ +")" - endif -endif - -[Winbatch_uninstall_old] -"$UninstallProgramOld$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- - -[Winbatch_uninstall] -"$UninstallProgram$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- - -[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 $NAME$ - -[sub_CustomPostUninstall] -include_insert "%ScriptPath%\custom\" + $Property_CustomPostUninstall$ - -[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.opsiscript b/CLIENT_DATA/delsub3264.opsiscript new file mode 100644 index 0000000..db0d530 --- /dev/null +++ b/CLIENT_DATA/delsub3264.opsiscript @@ -0,0 +1,178 @@ +; 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$ + "\" + $UninstallExecutable32$ +Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" + +Set $UninstallProgram64$ = $InstallDir64$ + "\" + $UninstallExecutable64$ +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","") + Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..." + else + Message "Uninstalling " + $ProductId$ + " 32 Bit..." + endif + + if FileExists($IniFile32$) + Set $UninstallExecutable32$ = GetValueFromInifile($IniFile$,"X86","UninstallExecutable32","XXXXXXXX.exe") + Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallExecutable32$ + if FileExists($UninstallProgramOld32$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_old_32 + sub_check_exitcode + endif + endif + if FileExists($UninstallProgram32$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_32 + 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","") + Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..." + else + Message "Uninstalling " + $ProductId$ + " 64 Bit..." + endif + + if FileExists($IniFile64$) + Set $UninstallExecutable64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallExecutable64","XXXXXXXX.exe") + Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallExecutable64$ + if FileExists($UninstallProgramOld64$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_old_64 + sub_check_exitcode + endif + endif + if FileExists($UninstallProgram64$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_64 + 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] +; Choose one of the following examples as basis for program uninstall +; +; === Nullsoft Scriptable Install System ================================================================ +; maby better Call as +; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10 +; "$UninstallProgramOld32$" /S +; +; === Inno Setup ======================================================================================== +"$UninstallProgramOld32$" /silent /norestart /SUPPRESSMSGBOXES /nocancel + +[Winbatch_uninstall_32] +; Choose one of the following examples as basis for program uninstall +; +; === Nullsoft Scriptable Install System ================================================================ +; maby better Call as +; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10 +; "$UninstallProgram32$" /S +; +; === Inno Setup ======================================================================================== +"$UninstallProgram32$" /silent /norestart /SUPPRESSMSGBOXES /nocancel + + +[Files_uninstall_32] +; Example for recursively deleting the installation directory (don't forget the trailing backslash): +; +delete -sf "$InstallDir32$\" + +[Winbatch_uninstall_old_64] +; Choose one of the following examples as basis for program uninstall +; +; === Nullsoft Scriptable Install System ================================================================ +; maby better Call as +; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10 +; "$UninstallProgramOld64$" /S +; +; === Inno Setup ======================================================================================== +"$UninstallProgramOld64$" /silent /norestart /SUPPRESSMSGBOXES /nocancel + +[Winbatch_uninstall_64] +; Choose one of the following examples as basis for program uninstall +; +; === Nullsoft Scriptable Install System ================================================================ +; maby better Call as +; Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 10 +; "$UninstallProgram64$" /S +; +; === Inno Setup ======================================================================================== +"$UninstallProgram64$" /silent /norestart /SUPPRESSMSGBOXES /nocancel + +[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/setup32.ins b/CLIENT_DATA/setup32.ins deleted file mode 100644 index 1389836..0000000 --- a/CLIENT_DATA/setup32.ins +++ /dev/null @@ -1,180 +0,0 @@ -; Copyright (c) uib gmbh (www.uib.de) -; This sourcecode is owned by uib -; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/en/credits/ - -[Actions] -requiredWinstVersion >= "4.11.2.6" - -DefVar $UninstallProgram$ -DefVar $UninstallProgramOld$ -DefVar $IniFile$ -DefVar $IniCfgFile$ -DefVar $LogDir$ -DefVar $ProductId$ -DefVar $MinimumSpace$ -DefVar $InstallDir$ -DefVar $ExitCode$ -DefVar $OLD_VERSION$ -DefVar $OLD_CREATOR_TAG$ -DefVar $OLD_RELEASE$ - -;Property Variables -DefVar $Property_CustomPostInstall$ -DefVar $Property_DesktopLink$ - -Set $LogDir$ = "%opsiLogDir%" - -; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh -; and adds the following variables: -; from builder-product.cfg : all variables definded by attribute WINST[index] -; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE -; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL -; auto generated winst-variables -; $IconFile$: path to product picture -; -@@BUILDER_VARIABLES@@ - -; ---------------------------------------------------------------- -; - Please edit the following values - -; ---------------------------------------------------------------- -;$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$ = "1 MB" -; the path were we find the product after the installation -Set $InstallDir$ = "%ProgramFiles32Dir%\CamStudio" -; ---------------------------------------------------------------- - -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 "No Space" - ; Stop process and set installation status to failed -else - comment "Show product picture" - ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ - - if FileExists("%ScriptPath%\delsub32.ins") - comment "Start uninstall sub section" - Sub "%ScriptPath%\delsub32.ins" - 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 - - Set $Property_DesktopLink$ = GetProductProperty("DesktopLink","false") - if ($Property_DesktopLink$ = "true") - comment "Create shortcuts" - LinkFolder_install - endif - - Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none") - if not ($Property_CustomPostInstall$ = "none") - comment "Include custom post install file" - if FileExists("%ScriptPath%\custom\" + $Property_CustomPostInstall$) - sub_CustomPostInstall - else - LogError "Include script NOT exists (" + $Property_CustomPostInstall$ +")" - endif - endif - -endif - -[Winbatch_install] -"$InstallExe$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- /DIR="$InstallDir$" -; "$InstallCodecExe$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- /DIR="$InstallDir$" - -[Files_install] -; copy the ini file to the InstallDir -copy "$IniCfgFile$" "$InstallDir$" - -; Example of recursively copying some files into the installation directory: -; -; 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 - -[LinkFolder_install] -; Example of deleting a folder from AllUsers startmenu: -; -; set_basefolder common_programs -; delete_subfolder $ProductId$ -; -; Example of creating an shortcut to the installed exe in AllUsers startmenu: -; -; set_basefolder common_programs -; set_subfolder $ProductId$ -; -; set_link -; name: $ProductId$ -; target: -; parameters: -; working_dir: $InstallDir$ -; icon_file: -; icon_index: -; end_link -; -; Example of creating an shortcut to the installed exe on AllUsers desktop: -; -set_basefolder common_desktopdirectory -set_subfolder "" -; -set_link - name: $NAME$ - target: "$InstallDir$\Recorder.exe" - parameters: - working_dir: $InstallDir$ - icon_file: - icon_index: -end_link - -[sub_CustomPostInstall] -include_insert "%ScriptPath%\custom\" + $Property_CustomPostInstall$ - -[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/setup3264.opsiscript b/CLIENT_DATA/setup3264.opsiscript new file mode 100644 index 0000000..31e47ad --- /dev/null +++ b/CLIENT_DATA/setup3264.opsiscript @@ -0,0 +1,301 @@ +; Copyright (c) uib gmbh (www.uib.de) +; This sourcecode is owned by uib +; and published under the Terms of the General Public License. +; credits: http://www.opsi.org/en/credits/ + +[Actions] +requiredWinstVersion >= "4.11.4.6" +ScriptErrorMessages=off + +DefVar $UninstallProgram32$ +DefVar $UninstallProgramOld32$ +DefVar $IniFile32$ +DefVar $UninstallProgram64$ +DefVar $UninstallProgramOld64$ +DefVar $IniFile64$ +DefVar $IniCfgFile$ +DefVar $LogDir$ +DefVar $ProductId$ +DefVar $MinimumSpace$ +DefVar $InstallDir32$ +DefVar $InstallDir64$ +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$ = "%opsiLogDir%" + +; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh +; and adds the following variables: +; from builder-product.cfg : all variables definded by attribute WINST[index] +; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE +; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL +; auto generated winst-variables +; $IconFile$: path to product picture +; +@@BUILDER_VARIABLES@@ + +; ---------------------------------------------------------------- +; - Please edit the following values - +; ---------------------------------------------------------------- +; $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$ = "20 MB" +; the path were we find the product after the installation +Set $InstallDir32$ = "%ProgramFiles32Dir%\CamStudio" +Set $InstallDir64$ = "%ProgramFiles64Dir%\CamStudio" +; ---------------------------------------------------------------- + +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 + ; Stop process and set installation status to failed +else + comment "Show product picture" + ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ + + if FileExists("%ScriptPath%\delsub3264.opsiscript") + comment "Start uninstall sub section" + Sub "%ScriptPath%\delsub3264.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_32 + comment "File Type Association" + DosInAnIcon_FileTypeAssoc_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_64 + comment "File Type Association" + DosInAnIcon_FileTypeAssoc_install + endif + +endif + +[Winbatch_install_32] +; Choose one of the following examples as basis for your installation +; You can use $LicenseKey$ var to pass a license key to the installer +; +; === Nullsoft Scriptable Install System ================================================================ +; "%ScriptPath%\Setup.exe" /S +; +; === MSI package ======================================================================================= +; You may use the parameter PIDKEY=$Licensekey$ +; msiexec /i "%ScriptPath%\some.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb-! ALLUSERS=1 REBOOT=ReallySuppress +; +; === InstallShield + MSI===================================================================================== +; Attention: The path to the log file should not contain any whitespaces +; "%ScriptPath%\setup.exe" /s /v" /l* $LogDir$\$ProductId$.install_log.txt /qb-! ALLUSERS=1 REBOOT=ReallySuppress" +; "%ScriptPath%\setup.exe" /s /v" /qb-! ALLUSERS=1 REBOOT=ReallySuppress" +; +; === InstallShield ===================================================================================== +; Create setup.iss answer file by running: setup.exe /r /f1"c:\setup.iss" +; You may use an answer file by the parameter /f1"c:\setup.iss" +; "%ScriptPath%\setup.exe" /s /sms /f2"$LogDir$\$ProductId$.install_log.txt" +; +; === Inno Setup ======================================================================================== +; http://unattended.sourceforge.net/InnoSetup_Switches_ExitCodes.html +; You may create setup answer file by: setup.exe /SAVEINF="filename" +; You may use an answer file by the parameter /LOADINF="filename" +"Install32Exe" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES /DIR="$InstallDir32$" + +[Files_install_32] +; copy the ini file to the InstallDir +copy "$IniCfgFile$" "$InstallDir32$" + +; Example of recursively copying some files into the installation directory: +; +; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" + +[Winbatch_install_64] +; Choose one of the following examples as basis for your installation +; You can use $LicenseKey$ var to pass a license key to the installer +; +; === Nullsoft Scriptable Install System ================================================================ +; "%ScriptPath%\Setup.exe" /S +; +; === MSI package ======================================================================================= +; You may use the parameter PIDKEY=$Licensekey$ +; msiexec /i "%ScriptPath%\some.msi" /l* "$LogDir$\$ProductId$.install_log.txt" /qb-! ALLUSERS=1 REBOOT=ReallySuppress +; +; === InstallShield + MSI===================================================================================== +; Attention: The path to the log file should not contain any whitespaces +; "%ScriptPath%\setup.exe" /s /v" /l* $LogDir$\$ProductId$.install_log.txt /qb-! ALLUSERS=1 REBOOT=ReallySuppress" +; "%ScriptPath%\setup.exe" /s /v" /qb-! ALLUSERS=1 REBOOT=ReallySuppress" +; +; === InstallShield ===================================================================================== +; Create setup.iss answer file by running: setup.exe /r /f1"c:\setup.iss" +; You may use an answer file by the parameter /f1"c:\setup.iss" +; "%ScriptPath%\setup.exe" /s /sms /f2"$LogDir$\$ProductId$.install_log.txt" +; +; === Inno Setup ======================================================================================== +; http://unattended.sourceforge.net/InnoSetup_Switches_ExitCodes.html +; You may create setup answer file by: setup.exe /SAVEINF="filename" +; You may use an answer file by the parameter /LOADINF="filename" +"Install64Exe" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES /DIR="$InstallDir64$" + +[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$" + +[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 + +[LinkFolder_install_32] +set_basefolder common_desktopdirectory +set_subfolder "" +delete_element "$NAME$" + +; Example of deleting a folder from AllUsers startmenu: +; +; set_basefolder common_programs +; delete_subfolder $ProductId$ +; +; Example of creating an shortcut to the installed exe in AllUsers startmenu: +; +; set_basefolder common_programs +; set_subfolder $ProductId$ +; +; set_link +; name: $ProductId$ +; target: $InstallDir32$\$ProgramExecutable32$ +; parameters: +; working_dir: $InstallDir32$ +; icon_file: +; icon_index: +; end_link +; +; Example of creating an shortcut to the installed exe on AllUsers desktop: +; +; set_basefolder common_desktopdirectory +; set_subfolder "" +; +; set_link +; name: $ProductId$ +; target: $InstallDir32$\$ProgramExecutable32$ +; parameters: +; working_dir: $InstallDir32$ +; icon_file: +; icon_index: 2 +; end_link + +[LinkFolder_install_64] +set_basefolder common_desktopdirectory +set_subfolder "" +delete_element "$NAME$" + +; Example of deleting a folder from AllUsers startmenu: +; +; set_basefolder common_programs +; delete_subfolder $ProductId$ +; +; Example of creating an shortcut to the installed exe in AllUsers startmenu: +; +; set_basefolder common_programs +; set_subfolder $ProductId$ +; +; set_link +; name: $ProductId$ +; target: $InstallDir64$\$ProgramExecutable64$ +; parameters: +; working_dir: $InstallDir64$ +; icon_file: +; icon_index: +; end_link +; +; Example of creating an shortcut to the installed exe on AllUsers desktop: +; +; set_basefolder common_desktopdirectory +; set_subfolder "" +; +; set_link +; name: $ProductId$ +; target: $InstallDir64$\$ProgramExecutable64$ +; parameters: +; working_dir: $InstallDir64$ +; 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 +; 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/uninstall32.ins b/CLIENT_DATA/uninstall3264.opsiscript similarity index 67% rename from CLIENT_DATA/uninstall32.ins rename to CLIENT_DATA/uninstall3264.opsiscript index ace6f16..7bae77f 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall3264.opsiscript @@ -4,20 +4,31 @@ ; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.11.2.6" +requiredWinstVersion >= "4.11.4.6" +ScriptErrorMessages=off -DefVar $UninstallProgram$ -DefVar $UninstallProgramOld$ -DefVar $IniFile$ +DefVar $UninstallProgram32$ +DefVar $UninstallProgramOld32$ +DefVar $IniFile32$ +DefVar $UninstallProgram64$ +DefVar $UninstallProgramOld64$ +DefVar $IniFile64$ DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ -DefVar $InstallDir$ +DefVar $InstallDir32$ +DefVar $InstallDir64$ +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$ = "%opsiLogDir%" ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh @@ -33,7 +44,8 @@ Set $LogDir$ = "%opsiLogDir%" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $InstallDir$ = "%ProgramFiles32Dir%\CamStudio" +Set $InstallDir32$ = "%ProgramFiles32Dir%\CamStudio" +Set $InstallDir64$ = "%ProgramFiles64Dir%\CamStudio" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" @@ -43,8 +55,8 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." -if FileExists("%ScriptPath%\delsub32.ins") +if FileExists("%ScriptPath%\delsub3264.opsiscript") comment "Start uninstall sub section" - Sub "%ScriptPath%\delsub32.ins" + Sub "%ScriptPath%\delsub3264.opsiscript" endif diff --git a/CamStudio-3.0-alpha.4-0.exe.sha1sum b/CamStudio-3.0-alpha.4-0.exe.sha1sum new file mode 100644 index 0000000..42cface --- /dev/null +++ b/CamStudio-3.0-alpha.4-0.exe.sha1sum @@ -0,0 +1 @@ +62c325fe0915dd485b1f16f0e29650582bec8883 /home/mario/.opsi-dist-cache/camstudio.camstudio-3.0a4/X86/CamStudio-3.0-alpha.4-0.exe diff --git a/CamStudio-Setup-2.7.2.rev326.exe.sha1sum b/CamStudio-Setup-2.7.2.rev326.exe.sha1sum deleted file mode 100644 index 805b259..0000000 --- a/CamStudio-Setup-2.7.2.rev326.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -023751785d671d7091f30f329e225d660ed8bc3f /home/mario/.opsi-dist-cache/camstudio.camstudio-2.7.2.rev326/X86/CamStudio-Setup-2.7.2.rev326.exe diff --git a/CamStudioCodec_1.5_Setup.exe.sha1sum b/CamStudioCodec_1.5_Setup.exe.sha1sum deleted file mode 100644 index 2eee54a..0000000 --- a/CamStudioCodec_1.5_Setup.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -4f4b4c5852fc2ba3e3da7a523683a7616c58879b /home/mario/.opsi-dist-cache/camstudio.camstudio-2.7.2.rev326/X86/CamStudioCodec_1.5_Setup.exe diff --git a/OPSI/control b/OPSI/control index 716530b..5ba25a2 100644 --- a/OPSI/control +++ b/OPSI/control @@ -1,46 +1,44 @@ [Package] -version: RELEASE +version: 1 depends: incremental: False [Product] type: localboot -id: camstudio.camstudio -name: camstudio -description: Free Streaming Video Software -advice: ADVICE -version: VERSION -priority: PRIORITY +id: opsi-template +name: opsi template product +description: A template for opsi products +advice: +version: 4.0.6 +priority: 0 licenseRequired: False productClasses: -setupScript: setup32.ins -uninstallScript: uninstall32.ins +setupScript: setup3264.opsiscript +uninstallScript: uninstall3264.opsiscript updateScript: alwaysScript: onceScript: customScript: userLoginScript: -[ProductProperty] -type: bool -name: desktoplink -description: Show Desktop Link on/off -default: False - [ProductProperty] type: unicode -name: custom-post-install +name: install_architecture multivalue: False -editable: True -description: Define filename for include script in custom directory after installation -values: ["none"] -default: ["none"] +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 -[ProductProperty] -type: unicode -name: custom-post-uninstall -multivalue: False -editable: True -description: Define filename for include script in custom directory after uninstallation -values: ["none"] -default: ["none"] \ No newline at end of file diff --git a/builder-product.cfg b/builder-product.cfg index 0379008..444e418 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -5,8 +5,7 @@ VENDOR="camstudio.org" PN="camstudio.camstudio" NAME="CamStudio" DESCRIPTION="CamStudio is able to record all screen and audio activity on your computer and create industry-standard AVI video files." -VERSION="2.7.2.rev326" -VERSION_CODEC="1.5" +VERSION="3.0a4" RELEASE="1" PRIORITY="0" ADVICE="" @@ -19,19 +18,41 @@ TYPE="public" DL_FILE[0]="camstudio.logo.png" DL_SOURCE[0]="http://hugoware.net/download/designs/camstudio.logo.png" -DL_FILE[1]="CamStudio-Setup-${VERSION}.exe" -DL_SOURCE[1]="https://sourceforge.net/projects/camstudio/files/stable/CamStudio_Setup_2-7_r316.exe" +DL_FILE[1]="CamStudio-3.0-alpha.4-0.exe" +DL_SOURCE[1]="https://github.com/stevenhoving/camstudio/releases/download/3.0-alpha.4/CamStudio-3.0-alpha.4-0.exe" DL_ARCH[1]="X86" -DL_WINST_NAME[1]=InstallExe +DL_WINST_NAME[1]=Install32Exe -DL_FILE[2]="CamStudioCodec_${VERSION_CODEC}_Setup.exe" -DL_SOURCE[2]="https://sourceforge.net/projects/camstudio/files/legacy/CamStudioCodec_${VERSION_CODEC}_Setup.exe" -DL_ARCH[2]="X86" -DL_WINST_NAME[2]=InstallCodecExe +DL_FILE[2]="CamStudio-3.0-alpha.4-0.exe" +DL_SOURCE[2]="https://github.com/stevenhoving/camstudio/releases/download/3.0-alpha.4/CamStudio-3.0-alpha.4-0.exe" +DL_ARCH[2]="X86_64" +DL_WINST_NAME[2]=Install64Exe # File array index for the image showing while installing the program ICON_DL_INDEX=0 +####################################### +# specify Executable for Desktop link +####################################### + +on the dual arch package +WINST_NAME[0]="ProgramExecutable32" +WINST_VALUE[0]="CamStudioRecorder.exe" + +# AND + +WINST_NAME[1]="ProgramExecutable64" +WINST_VALUE[1]="CamStudioRecorder.exe" + + +##### Installer ############## OPSI_INI_SECTION[0]="X86" -OPSI_INI_OPTION[0]="UninstallProg" +OPSI_INI_OPTION[0]="UninstallExecutable32" OPSI_INI_VALUE[0]="unins000.exe" + +# AND + +OPSI_INI_SECTION[1]="X86_64" +OPSI_INI_OPTION[1]="UninstallExecutable64" +OPSI_INI_VALUE[1]="unins000.exe" +