From b3ea609123e9d7a9d1b38d9e8a04b019f6017173 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 15 Mar 2013 16:03:54 +0100 Subject: [PATCH] update to new opsi builder template --- CLIENT_DATA/delsub32.ins | 41 +++++----- CLIENT_DATA/login.ins | 24 ++++++ CLIENT_DATA/opsi-safernetworking.spybotsd.ini | 1 - CLIENT_DATA/setup32.ins | 81 ++++--------------- CLIENT_DATA/uninstall32.ins | 39 +++------ SpybotSD-2.0.12.exe.sha1sum | 1 + builder-product.cfg | 37 +++++++-- spybotsd-2.0.11.exe.sha1sum | 1 - 8 files changed, 100 insertions(+), 125 deletions(-) create mode 100644 CLIENT_DATA/login.ins create mode 100644 SpybotSD-2.0.12.exe.sha1sum delete mode 100644 spybotsd-2.0.11.exe.sha1sum diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 80596c7..4a4baca 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -1,19 +1,25 @@ ; 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/credits/ +; credits: http://www.opsi.org/en/credits/ -Set $UninstallProgram$ = $InstallDir$ + "\unins000.exe" +Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$ Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" -Message "Uninstalling " + $ProductId$ + " ..." +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 $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") - if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "") - comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version" - Winbatch_uninstall_msi_old + 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 endif endif @@ -22,11 +28,6 @@ if FileExists($UninstallProgram$) Winbatch_uninstall sub_check_exitcode endif -if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "") - comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall" - Winbatch_uninstall_msi - sub_check_exitcode -endif comment "Delete files" Files_uninstall /32Bit @@ -37,20 +38,18 @@ Registry_uninstall /32Bit comment "Delete program shortcuts" LinkFolder_uninstall +[Winbatch_uninstall_old] +"$UninstallProgramOld$" /silent /norestart /SUPPRESSMSGBOXES /nocancel + + [Winbatch_uninstall] -"$UninstallProgram$" /S +"$UninstallProgram$" /silent /norestart /SUPPRESSMSGBOXES /nocancel -[Winbatch_uninstall_msi_old] -msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress - -[Winbatch_uninstall_msi] -msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress - [Files_uninstall] -; Example for recursively deleting the installation directory (don't forget the trailing backslash): +; Example for recursively deleting the installation directory: ; -; delete -sf "$InstallDir$\" +del -sf "$InstallDir$\" [Registry_uninstall] ; Example of deleting a registry key: diff --git a/CLIENT_DATA/login.ins b/CLIENT_DATA/login.ins new file mode 100644 index 0000000..7b85744 --- /dev/null +++ b/CLIENT_DATA/login.ins @@ -0,0 +1,24 @@ +; 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/ + +[Actions] +Message "Profile Patch for VLC ...." + +comment "Did we run this script before ? - and set version stamp in profile" +if getValue("installationstate", getProductMap) = "installed" + comment "Product is installed" + if not (scriptWasExecutedBefore) + comment "loginscript was not run yet " + Files_profile_copy + Registry_currentuser_set + endif +endif + +[Files_profile_copy] +copy "%Scriptpath%\profiles\*.*" "%CurrentAppdataDir%\ACME" + +[Registry_currentuser_set] +openkey [HKCU\Software\ACME] +set "show_greeting_window" = "no" diff --git a/CLIENT_DATA/opsi-safernetworking.spybotsd.ini b/CLIENT_DATA/opsi-safernetworking.spybotsd.ini index 7dc28b2..c8cd644 100644 --- a/CLIENT_DATA/opsi-safernetworking.spybotsd.ini +++ b/CLIENT_DATA/opsi-safernetworking.spybotsd.ini @@ -1,5 +1,4 @@ [X86] -MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} [COMMON] PN=safernetworking.spybotsd diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index c065ae1..867c2c8 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -1,14 +1,13 @@ ; 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/credits/ +; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.10.8.6" +requiredWinstVersion >= "4.11.2.6" -; DefVar $MsiId$ -DefVar $MsiIdOld$ DefVar $UninstallProgram$ +DefVar $UninstallProgramOld$ DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$ @@ -16,9 +15,9 @@ DefVar $ProductId$ DefVar $MinimumSpace$ DefVar $InstallDir$ DefVar $ExitCode$ -DefVar $LicenseRequired$ -DefVar $LicenseKey$ -DefVar $LicensePool$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -38,36 +37,30 @@ Set $LogDir$ = "%SystemDrive%\tmp" ;$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 $ProductId$ = "safernetworking.spybotsd" Set $MinimumSpace$ = "100 MB" ; the path were we find the product after the installation Set $InstallDir$ = "%ProgramFiles32Dir%\Spybot - Search & Destroy 2" -Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- +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" $ProductId$ + ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ if FileExists("%ScriptPath%\delsub32.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub32.ins" endif - Message "Installing " + $ProductId$ + " ..." - - if $LicenseRequired$ = "true" - comment "Licensing required, reserve license and get license key" - Sub_get_licensekey - endif + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" Winbatch_install Sub_check_exitcode @@ -80,19 +73,11 @@ else comment "Create shortcuts" LinkFolder_install - comment "Test for installation success" - ; Test if software marked as installed in registry - ; if (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] DisplayName") = "") - ; logError "Fatal: After Installation 32 bit [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] not found" - ; isFatalError - ; else - ; comment "Successful Installation" - ; endif - endif [Winbatch_install] -"$InstallExe$" /sp- /silent /norestart /SUPPRESSMSGBOXES +"InstallExe" /VERYSILENT /LOADINF="$IniCfgFile$" +taskkill /F /IM SDWelcome.exe [Files_install] ; copy the ini file to the InstallDir @@ -144,44 +129,6 @@ copy "$IniCfgFile$" "$InstallDir$" ; icon_index: 2 ; end_link -[Sub_get_licensekey] -if opsiLicenseManagementEnabled - comment "License management is enabled and will be used" - - comment "Trying to get a license key" - Set $LicenseKey$ = demandLicenseKey ($LicensePool$) - ; If there is an assignment of exactly one licensepool to the product the following call is possible: - ; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$) - ; - ; If there is an assignment of a license pool to a windows software id, it is possible to use: - ; DefVar $WindowsSoftwareId$ - ; $WindowsSoftwareId$ = "..." - ; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$) - - DefVar $ServiceErrorClass$ - set $ServiceErrorClass$ = getLastServiceErrorClass - comment "Error class: " + $ServiceErrorClass$ - - if $ServiceErrorClass$ = "None" - comment "Everything fine, we got the license key '" + $LicenseKey$ + "'" - else - if $ServiceErrorClass$ = "LicenseConfigurationError" - LogError "Fatal: license configuration must be corrected" - LogError getLastServiceErrorMessage - isFatalError - else - if $ServiceErrorClass$ = "LicenseMissingError" - LogError "Fatal: required license is not supplied" - isFatalError - endif - endif - endif -else - LogError "Fatal: license required, but license management not enabled" - isFatalError -endif - - [Sub_check_exitcode] comment "Test for installation success via exit code" set $ExitCode$ = getLastExitCode diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index ec17876..0848a97 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -1,22 +1,22 @@ ; 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/credits/ +; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.10.8.6" +requiredWinstVersion >= "4.11.2.6" -; DefVar $MsiId$ -DefVar $MsiIdOld$ DefVar $UninstallProgram$ -DefVar $LogDir$ +DefVar $UninstallProgramOld$ DefVar $IniFile$ DefVar $IniCfgFile$ +DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ DefVar $InstallDir$ -DefVar $LicenseRequired$ -DefVar $LicensePool$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -33,15 +33,13 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $ProductId$ = "safernetworking.spybotsd" Set $InstallDir$ = "%ProgramFiles32Dir%\Spybot - Search & Destroy 2" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" comment "Show product picture" -ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ +ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." @@ -50,22 +48,3 @@ if FileExists("%ScriptPath%\delsub32.ins") Sub "%ScriptPath%\delsub32.ins" endif -if $LicenseRequired$ = "true" - comment "Licensing required, free license used" - Sub_free_license -endif - -[Sub_free_license] -comment "License management is enabled and will be used" - -comment "Trying to free license used for the product" -DefVar $result$ -Set $result$ = FreeLicense($LicensePool$) -; If there is an assignment of a license pool to the product, it is possible to use -; Set $result$ = FreeLicense("", $ProductId$) -; -; If there is an assignment of a license pool to a windows software id, it is possible to use -; DefVar $WindowsSoftwareId$ -; $WindowsSoftwareId$ = "..." -; set $result$ = FreeLicense("", "", $WindowsSoftwareId$) - diff --git a/SpybotSD-2.0.12.exe.sha1sum b/SpybotSD-2.0.12.exe.sha1sum new file mode 100644 index 0000000..3379355 --- /dev/null +++ b/SpybotSD-2.0.12.exe.sha1sum @@ -0,0 +1 @@ +9e85e03e96a30b23ae7f95b0c06eb501f8ba645c /home/mario/.opsi-dist-cache/safernetworking.spybotsd-2.0.12/X86/SpybotSD-2.0.12.exe diff --git a/builder-product.cfg b/builder-product.cfg index 22fea2f..65ea9ac 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,7 +3,9 @@ ############################ VENDOR="safer-networking.org" PN="safernetworking.spybotsd" -VERSION="2.0.11" +NAME="Spybot S&D" +DESCRIPTION="Spybot Search & Destroy" +VERSION="2.0.12" RELEASE="3" PRIORITY="0" ADVICE="" @@ -15,14 +17,39 @@ TYPE="public" DL_FILE[0]="spybot_icon_png.png" DL_SOURCE[0]="http://rocketdock.com/images/screenshots/thumbnails/spybot_icon_png.png" -DL_FILE[1]="spybotsd-${VERSION}.exe" -DL_SOURCE[1]="http://spybotupdate.biz/files/spybotsd-2.0.11-rc3.exe" +DL_FILE[1]="SpybotSD-${VERSION}.exe" +DL_SOURCE[1]="http://www.spybotupdates.com/files/SpybotSD2.exe" DL_ARCH[1]="X86" DL_WINST_NAME[1]=InstallExe # File array index for the image showing while installing the program ICON_DL_INDEX=0 -WINST_NAME[0]="MsiId" -WINST_VALUE[0]="{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}" +OPSI_INI_SECTION[0]="X86" +OPSI_INI_OPTION[0]="UninstallProg" +OPSI_INI_VALUE[0]="unins000.exe" + +OPSI_INI_SECTION[1]="Setup" +OPSI_INI_OPTION[1]="Lang" +OPSI_INI_VALUE[1]="de" + +OPSI_INI_SECTION[2]="Setup" +OPSI_INI_OPTION[2]="Group" +OPSI_INI_VALUE[2]="Spybot - Search & Destroy 2" + +OPSI_INI_SECTION[3]="Setup" +OPSI_INI_OPTION[3]="NoIcons" +OPSI_INI_VALUE[3]="0" + +OPSI_INI_SECTION[4]="Setup" +OPSI_INI_OPTION[4]="SetupType" +OPSI_INI_VALUE[4]="full" + +OPSI_INI_SECTION[5]="Setup" +OPSI_INI_OPTION[5]="Components" +OPSI_INI_VALUE[5]="mainmodules,ntservices,browsersupport,tools,translations,promodules,runtimepackages,redistributablesssl,bootcd,detectivemodules,updateservice,wscservice" + +OPSI_INI_SECTION[6]="Setup" +OPSI_INI_OPTION[6]="Tasks" +OPSI_INI_VALUE[6]="createsystemscanschedule,createimmunizationschedule,createupdateschedule,autoplayintegration,explorerintegrationdll,sdhelper" diff --git a/spybotsd-2.0.11.exe.sha1sum b/spybotsd-2.0.11.exe.sha1sum deleted file mode 100644 index 97f4f3e..0000000 --- a/spybotsd-2.0.11.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -636fbeb0f4ed9e96d6f8809c4517111d4b5997e3 /home/mario/.opsi-dist-cache/safernetworking.spybotsd-2.0.11/X86/spybotsd-2.0.11.exe