From 3b0618350876312f9ecb34a20113e291db1457ca Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 15 Mar 2013 14:02:31 +0100 Subject: [PATCH] update to new opsi builder template --- CLIENT_DATA/delsub3264.ins | 54 ++++++++++++++++++++++++------ CLIENT_DATA/login.ins | 24 +++++++++++++ CLIENT_DATA/opsi-peazip.peazip.ini | 7 ++++ CLIENT_DATA/setup3264.ins | 32 +++++++++++++----- CLIENT_DATA/uninstall3264.ins | 19 ++++++++--- builder-product.cfg | 16 ++++++--- peazip-4.8.1.WIN64.exe.sha1sum | 1 - peazip-4.8.1.WINDOWS.exe.sha1sum | 1 - peazip-4.9.WIN64.exe.sha1sum | 1 + peazip-4.9.WINDOWS.exe.sha1sum | 1 + peazip-logo-primary.jpg.sha1sum | 1 - peazip_2.png.sha1sum | 1 + 12 files changed, 128 insertions(+), 30 deletions(-) create mode 100644 CLIENT_DATA/login.ins create mode 100644 CLIENT_DATA/opsi-peazip.peazip.ini delete mode 100644 peazip-4.8.1.WIN64.exe.sha1sum delete mode 100644 peazip-4.8.1.WINDOWS.exe.sha1sum create mode 100644 peazip-4.9.WIN64.exe.sha1sum create mode 100644 peazip-4.9.WINDOWS.exe.sha1sum delete mode 100644 peazip-logo-primary.jpg.sha1sum create mode 100644 peazip_2.png.sha1sum diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins index 5131023..93da5a3 100644 --- a/CLIENT_DATA/delsub3264.ins +++ b/CLIENT_DATA/delsub3264.ins @@ -1,16 +1,32 @@ ; 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 $UninstallProgram32$ = $InstallDir32$ + "\unins000.exe" +Set $UninstallProgram32$ = $InstallDir32$ + "\" + $UninstallProg32$ +Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" -Set $UninstallProgram64$ = $InstallDir64$ + "\unins000.exe" +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") - Message "Uninstalling " + $ProductId$ + " 32 Bit..." + 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 + sub_check_exitcode + endif + endif if FileExists($UninstallProgram32$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_32 @@ -24,8 +40,22 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif endif if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) - Message "Uninstalling " + $ProductId$ + " 64 Bit..." + 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 + sub_check_exitcode + endif + endif if FileExists($UninstallProgram64$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_64 @@ -41,23 +71,27 @@ endif comment "Delete program shortcuts" LinkFolder_uninstall +[Winbatch_uninstall_old_32] +"$UninstallProgramOld32$" /SILENT + [Winbatch_uninstall_32] "$UninstallProgram32$" /SILENT - [Files_uninstall_32] ; Example for recursively deleting the installation directory (don't forget the trailing backslash): ; -; delete -sf "$InstallDir32$\" +delete -sf "$InstallDir32$\" + +[Winbatch_uninstall_old_64] +"$UninstallProgramOld64$" /SILENT [Winbatch_uninstall_64] "$UninstallProgram64$" /SILENT - [Files_uninstall_64] -; Example for recursively deleting the installation directory (don't forget the trailing backslash): +; Example for recursively deleting the installation directory: ; -; delete -sf "$InstallDir64$\" +del -sf "$InstallDir64$\" [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-peazip.peazip.ini b/CLIENT_DATA/opsi-peazip.peazip.ini new file mode 100644 index 0000000..3bcccd3 --- /dev/null +++ b/CLIENT_DATA/opsi-peazip.peazip.ini @@ -0,0 +1,7 @@ +[X86] + +[X86_64] + +[COMMON] +PN=name +VERSION=version diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index d9ef28d..46a24d4 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -1,13 +1,18 @@ ; 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 $UninstallProgram32$ +DefVar $UninstallProgramOld32$ +DefVar $IniFile32$ DefVar $UninstallProgram64$ +DefVar $UninstallProgramOld64$ +DefVar $IniFile64$ +DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ProductId$ DefVar $MinimumSpace$ @@ -16,11 +21,13 @@ 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$ = "%SystemDrive%\tmp" ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh @@ -39,20 +46,21 @@ 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$ = "peazip.peazip" Set $MinimumSpace$ = "15 MB" ; the path were we find the product after the installation Set $InstallDir32$ = "%ProgramFiles32Dir%\PeaZip" Set $InstallDir64$ = "%ProgramFiles64Dir%\PeaZip" ; ---------------------------------------------------------------- +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" $ProductId$ + ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ if FileExists("%ScriptPath%\delsub3264.ins") comment "Start uninstall sub section" @@ -62,8 +70,9 @@ else comment "installing" if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") - Message "Installing " + $ProductId$ + " 32 Bit..." + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" Winbatch_install_32 Sub_check_exitcode comment "Copy files" @@ -75,8 +84,9 @@ else endif if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) - Message "Installing " + $ProductId$ + " 64 Bit..." + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" Winbatch_install_64 Sub_check_exitcode comment "Copy files" @@ -90,9 +100,12 @@ else endif [Winbatch_install_32] -"$Install32Exe$" /SILENT +"Install32Exe" /SILENT [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$" @@ -101,6 +114,9 @@ endif "$Install64Exe$" /SILENT [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$" diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins index 38106f5..e1adf4a 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -1,13 +1,20 @@ ; 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 $UninstallProg32$ DefVar $UninstallProgram32$ +DefVar $UninstallProgramOld32$ +DefVar $IniFile32$ +DefVar $UninstallProg64$ DefVar $UninstallProgram64$ +DefVar $UninstallProgramOld64$ +DefVar $IniFile64$ +DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ @@ -15,11 +22,13 @@ 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$ = "%SystemDrive%\tmp" ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh @@ -35,14 +44,14 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $ProductId$ = "peazip.peazip" Set $InstallDir32$ = "%ProgramFiles32Dir%\PeaZip" Set $InstallDir64$ = "%ProgramFiles64Dir%\PeaZip" ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" comment "Show product picture" -ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ +ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." diff --git a/builder-product.cfg b/builder-product.cfg index a6fb732..75c8e41 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,7 +3,9 @@ ############################ VENDOR="peazip.org" PN="peazip.peazip" -VERSION="4.8.1" +NAME="PeaZip" +DESCRIPTION="PeaZip is a free cross-platform file archiver that provides an unified portable GUI for many Open Source technologies like 7-Zip, FreeArc, PAQ, UPX..." +VERSION="4.9" RELEASE="3" PRIORITY="0" ADVICE="" @@ -12,9 +14,8 @@ ADVICE="" # Valid value: restricted | public TYPE="public" - -DL_FILE[0]="peazip-logo-primary.jpg" -DL_SOURCE[0]="http://cf.juggle-images.com/matte/white/280x280/peazip-logo-primary.jpg" +DL_FILE[0]="peazip_2.png" +DL_SOURCE[0]="http://rocketdock.com/images/screenshots/peazip_2.png" DL_FILE[1]="peazip-${VERSION}.WINDOWS.exe" DL_SOURCE[1]="http://downloads.sourceforge.net/peazip/peazip-${VERSION}.WINDOWS.exe" @@ -29,3 +30,10 @@ DL_WINST_NAME[2]=Install64Exe # File array index for the image showing while installing the program ICON_DL_INDEX=0 +OPSI_INI_SECTION[0]="X86" +OPSI_INI_OPTION[0]="UninstallProg32" +OPSI_INI_VALUE[0]="unins000.exe" + +OPSI_INI_SECTION[1]="X86_64" +OPSI_INI_OPTION[1]="UninstallProg64" +OPSI_INI_VALUE[1]="unins000.exe" diff --git a/peazip-4.8.1.WIN64.exe.sha1sum b/peazip-4.8.1.WIN64.exe.sha1sum deleted file mode 100644 index 7e1da1c..0000000 --- a/peazip-4.8.1.WIN64.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -35e1da328d32d53b9fcac7dc5fddc4d34c468b97 /home/mario/.opsi-dist-cache/peazip.peazip-4.8.1/X86_64/peazip-4.8.1.WIN64.exe diff --git a/peazip-4.8.1.WINDOWS.exe.sha1sum b/peazip-4.8.1.WINDOWS.exe.sha1sum deleted file mode 100644 index 050fec1..0000000 --- a/peazip-4.8.1.WINDOWS.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -d71eb0be41c34e51e442aaa6235475080abaf176 /home/mario/.opsi-dist-cache/peazip.peazip-4.8.1/X86/peazip-4.8.1.WINDOWS.exe diff --git a/peazip-4.9.WIN64.exe.sha1sum b/peazip-4.9.WIN64.exe.sha1sum new file mode 100644 index 0000000..110533e --- /dev/null +++ b/peazip-4.9.WIN64.exe.sha1sum @@ -0,0 +1 @@ +be690f913c44ebaa0f266c27eaa2401d9c2e8b2a /home/mario/.opsi-dist-cache/peazip.peazip-4.9/X86_64/peazip-4.9.WIN64.exe diff --git a/peazip-4.9.WINDOWS.exe.sha1sum b/peazip-4.9.WINDOWS.exe.sha1sum new file mode 100644 index 0000000..faf1161 --- /dev/null +++ b/peazip-4.9.WINDOWS.exe.sha1sum @@ -0,0 +1 @@ +c47d8f5808dbf598edf77fa4fd0271dad9410547 /home/mario/.opsi-dist-cache/peazip.peazip-4.9/X86/peazip-4.9.WINDOWS.exe diff --git a/peazip-logo-primary.jpg.sha1sum b/peazip-logo-primary.jpg.sha1sum deleted file mode 100644 index 61166b1..0000000 --- a/peazip-logo-primary.jpg.sha1sum +++ /dev/null @@ -1 +0,0 @@ -7af38df6add3e1ef546cf6c5e9823d8f080ea35a /home/mario/.opsi-dist-cache/peazip.peazip-4.8//peazip-logo-primary.jpg diff --git a/peazip_2.png.sha1sum b/peazip_2.png.sha1sum new file mode 100644 index 0000000..3dadc96 --- /dev/null +++ b/peazip_2.png.sha1sum @@ -0,0 +1 @@ +883d8a7ca88548decc1f76b9d2b376629190bf9e /home/mario/.opsi-dist-cache/peazip.peazip-4.9//peazip_2.png