From 3a027652a4a9eab4bd35d3eb8a521e0e0bda11fa Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 26 Sep 2019 17:39:16 +0200 Subject: [PATCH] Bump to new installer und package are only 64bit now --- CLIENT_DATA/delsub3264.ins | 137 ------------------ CLIENT_DATA/delsub64.opsiscript | 115 +++++++++++++++ CLIENT_DATA/opsi-sourceforge.projectlibre.ini | 2 +- .../{setup3264.ins => setup64.opsiscript} | 136 +++++++++-------- ...install3264.ins => uninstall64.opsiscript} | 27 ++-- OPSI/control | 15 +- ProjectLibre-1.9.1.exe.sha1sum | 1 + builder-product.cfg | 30 ++-- projectlibre_x64_1.7.msi.sha1sum | 1 - projectlibre_x86_1.7.msi.sha1sum | 1 - 10 files changed, 224 insertions(+), 241 deletions(-) delete mode 100644 CLIENT_DATA/delsub3264.ins create mode 100644 CLIENT_DATA/delsub64.opsiscript rename CLIENT_DATA/{setup3264.ins => setup64.opsiscript} (58%) rename CLIENT_DATA/{uninstall3264.ins => uninstall64.opsiscript} (69%) create mode 100644 ProjectLibre-1.9.1.exe.sha1sum delete mode 100644 projectlibre_x64_1.7.msi.sha1sum delete mode 100644 projectlibre_x86_1.7.msi.sha1sum diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins deleted file mode 100644 index c0fdcce..0000000 --- a/CLIENT_DATA/delsub3264.ins +++ /dev/null @@ -1,137 +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 $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" - -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 $MsiIdOld32$ = GetValueFromInifile($IniFile32$,"X86","MsiId32","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") - if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld32$ + "] DisplayName") = "") - comment "Old MSI id " + $MsiIdOld32$ + " found in registry, starting msiexec to uninstall old version" - Winbatch_uninstall_msi_old_32 - sub_check_exitcode - endif - endif - if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "") - comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall" - Winbatch_uninstall_msi_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","") - endif - Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..." - - if FileExists($IniFile64$) - Set $MsiIdOld64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiId64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") - if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld64$ + "] DisplayName") = "") - comment "Old MSI id " + $MsiIdOld64$ + " found in registry, starting msiexec to uninstall old version" - Winbatch_uninstall_msi_old_64 - sub_check_exitcode - endif - endif - if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "") - comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall" - Winbatch_uninstall_msi_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_msi_old_32] -msiexec /x $MsiIdOld32$ /qb! REBOOT=ReallySuppress - -[Winbatch_uninstall_msi_32] -msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress - -[Files_uninstall_32] -; Example for recursively deleting the installation directory (don't forget the trailing backslash): -; -delete -sf "$InstallDir32$\" - -[Winbatch_uninstall_msi_old_64] -msiexec /x $MsiIdOld64$ /qb! REBOOT=ReallySuppress - -[Winbatch_uninstall_msi_64] -msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress - -[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/delsub64.opsiscript b/CLIENT_DATA/delsub64.opsiscript new file mode 100644 index 0000000..3c1408d --- /dev/null +++ b/CLIENT_DATA/delsub64.opsiscript @@ -0,0 +1,115 @@ +; 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_64","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 /64Bit + +comment "Cleanup registry" +Registry_uninstall /64Bit + +comment "Delete program shortcuts" +LinkFolder_uninstall + +[Winbatch_uninstall_old] +; 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 +; "$UninstallProgramOld$" /S +; +; === Inno Setup ======================================================================================== +"$UninstallProgramOld$" /silent /norestart /SUPPRESSMSGBOXES /nocancel + +[Winbatch_uninstall] +; 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 +; "$UninstallProgram$" /S +; +; === Inno Setup ======================================================================================== +"$UninstallProgram$" /silent /norestart /SUPPRESSMSGBOXES /nocancel + +[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/opsi-sourceforge.projectlibre.ini b/CLIENT_DATA/opsi-sourceforge.projectlibre.ini index 41585d5..9555cf1 100644 --- a/CLIENT_DATA/opsi-sourceforge.projectlibre.ini +++ b/CLIENT_DATA/opsi-sourceforge.projectlibre.ini @@ -1,4 +1,4 @@ -[X86] +[X86_64] [COMMON] PN=name diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup64.opsiscript similarity index 58% rename from CLIENT_DATA/setup3264.ins rename to CLIENT_DATA/setup64.opsiscript index c17e06b..08bd0dd 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup64.opsiscript @@ -4,29 +4,23 @@ ; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.11.2.6" +requiredWinstVersion >= "4.11.4.6" +ScriptErrorMessages=off -DefVar $MsiIdOld32$ -DefVar $IniFile32$ -DefVar $MsiIdOld64$ -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: @@ -44,10 +38,9 @@ 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 $MinimumSpace$ = "20 MB" +Set $MinimumSpace$ = "200 MB" ; the path were we find the product after the installation -Set $InstallDir32$ = "%ProgramFiles32Dir%\ProjectLibre" -Set $InstallDir64$ = "%ProgramFiles64Dir%\ProjectLibre" +Set $InstallDir$ = "%ProgramFiles64Dir%\ProjectLibre" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" @@ -60,64 +53,66 @@ else comment "Show product picture" ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ - if FileExists("%ScriptPath%\delsub3264.ins") + if FileExists("%ScriptPath%\delsub64.opsiscript") comment "Start uninstall sub section" - Sub "%ScriptPath%\delsub3264.ins" + Sub "%ScriptPath%\delsub64.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 /64Bit + + comment "Patch Registry" + Registry_install /64Bit + + comment "Create shortcuts" + LinkFolder_install + + comment "File Type Association" + DosInAnIcon_FileTypeAssoc_install + endif -[Winbatch_install_32] -msiexec /i "$Install32Msi$"" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress +[Winbatch_install] +; 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" +"$InstallExe$" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES -[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] -msiexec /i "$Install64Msi$"" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress - -[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: @@ -128,6 +123,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 @@ -161,6 +160,17 @@ copy "$IniCfgFile$" "$InstallDir64$" ; 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/uninstall64.opsiscript similarity index 69% rename from CLIENT_DATA/uninstall3264.ins rename to CLIENT_DATA/uninstall64.opsiscript index 1949640..4695b75 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall64.opsiscript @@ -4,28 +4,22 @@ ; credits: http://www.opsi.org/en/credits/ [Actions] -requiredWinstVersion >= "4.11.2.6" +requiredWinstVersion >= "4.11.4.6" +ScriptErrorMessages=off -DefVar $MsiIdOld32$ -DefVar $IniFile32$ -DefVar $MsiIdOld64$ -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: @@ -40,8 +34,7 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $InstallDir32$ = "%ProgramFiles32Dir%\ProjectLibre" -Set $InstallDir64$ = "%ProgramFiles64Dir%\ProjectLibre" +Set $InstallDir$ = "%ProgramFiles64Dir%\ProjectLibre" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" @@ -51,8 +44,8 @@ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." -if FileExists("%ScriptPath%\delsub3264.ins") +if FileExists("%ScriptPath%\delsub64.opsiscript") comment "Start uninstall sub section" - Sub "%ScriptPath%\delsub3264.ins" + Sub "%ScriptPath%\delsub64.opsiscript" endif diff --git a/OPSI/control b/OPSI/control index ec286f3..6138684 100644 --- a/OPSI/control +++ b/OPSI/control @@ -1,5 +1,5 @@ [Package] -version: 2 +version: 1 depends: incremental: False @@ -9,17 +9,17 @@ id: opsi-template name: opsi template product description: A template for opsi products advice: -version: 4.0.2 +version: 4.0.6 priority: 0 licenseRequired: False productClasses: -setupScript: setup3264.ins -uninstallScript: uninstall3264.ins +setupScript: setup64.opsiscript +uninstallScript: uninstall64.opsiscript updateScript: alwaysScript: onceScript: customScript: -userLoginScript: +userLoginScript: [ProductDependency] action: setup @@ -27,4 +27,9 @@ requiredProduct: sereby.aio requiredStatus: installed requirementType: before +[ProductDependency] +action: setup +requiredProduct: danysys.sfta +requiredStatus: installed +requirementType: before diff --git a/ProjectLibre-1.9.1.exe.sha1sum b/ProjectLibre-1.9.1.exe.sha1sum new file mode 100644 index 0000000..8c486db --- /dev/null +++ b/ProjectLibre-1.9.1.exe.sha1sum @@ -0,0 +1 @@ +2bcd47798b55a74fb08cf6ac0f7212fc3bb0925e /home/mario/.opsi-dist-cache/sourceforge.projectlibre-1.9.1/X86_64/ProjectLibre-1.9.1.exe diff --git a/builder-product.cfg b/builder-product.cfg index d0add38..0e29b30 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -5,7 +5,7 @@ VENDOR="projectlibre.org" PN="sourceforge.projectlibre" NAME="ProjectLibre" DESCRIPTION="ProjectLibre: open source replacement of Microsoft Project" -VERSION="1.7" +VERSION="1.9.1" RELEASE="3" PRIORITY="0" ADVICE="" @@ -17,24 +17,22 @@ TYPE="public" DL_FILE[0]="3956462.png" DL_SOURCE[0]="http://img.informer.com/icons/png/128/3956/3956462.png" -DL_FILE[1]="projectlibre_x86_${VERSION}.msi" -DL_SOURCE[1]="http://sourceforge.net/projects/projectlibre/files/ProjectLibre/${VERSION}/projectlibre-${VERSION}.msi" -DL_ARCH[1]="X86" -DL_WINST_NAME[1]=Install32Msi - -DL_FILE[2]="projectlibre_x64_${VERSION}.msi" -DL_SOURCE[2]="http://sourceforge.net/projects/projectlibre/files/ProjectLibre/${VERSION}/projectlibre-${VERSION}-x64.msi" -DL_ARCH[2]="X86_64" -DL_WINST_NAME[2]=Install64Msi +DL_FILE[1]="ProjectLibre-${VERSION}.exe" +DL_SOURCE[1]="https://sourceforge.net/projects/projectlibre/files/ProjectLibre/${VERSION}/ProjectLibre-${VERSION}.exe" +DL_ARCH[1]="X86_64" +DL_WINST_NAME[1]=InstallExe # File array index for the image showing while installing the program ICON_DL_INDEX=0 -OPSI_INI_SECTION[0]="X86" -OPSI_INI_OPTION[0]="MsiId32" -OPSI_INI_VALUE[0]="{4E352A24-AE3C-482F-9409-3E1C2B7ABED8}" +####################################### +# specify Executable for Desktop link +####################################### + +on 32bit or 64bit packages +WINST_NAME[0]="ProgramExecutable" +WINST_VALUE[0]="ProjectLibre.exe" OPSI_INI_SECTION[1]="X86_64" -OPSI_INI_OPTION[1]="MsiId64" -OPSI_INI_VALUE[1]="{65C756CE-CF9B-45E8-967E-E1A0D4B7902C}" - +OPSI_INI_OPTION[1]="UninstallExecutable" +OPSI_INI_VALUE[1]="unins000.exe" diff --git a/projectlibre_x64_1.7.msi.sha1sum b/projectlibre_x64_1.7.msi.sha1sum deleted file mode 100644 index 8cbdb71..0000000 --- a/projectlibre_x64_1.7.msi.sha1sum +++ /dev/null @@ -1 +0,0 @@ -55263999bd74317b660c881058f285b9b2ea64a3 /home/mario/.opsi-dist-cache/sourceforge.projectlibre-1.7/X86_64/projectlibre_x64_1.7.msi diff --git a/projectlibre_x86_1.7.msi.sha1sum b/projectlibre_x86_1.7.msi.sha1sum deleted file mode 100644 index 1b8db10..0000000 --- a/projectlibre_x86_1.7.msi.sha1sum +++ /dev/null @@ -1 +0,0 @@ -7ff09367d9c467fe062007e58e358ea64766adad /home/mario/.opsi-dist-cache/sourceforge.projectlibre-1.7/X86/projectlibre_x86_1.7.msi