From 57e17dc34b1c148bced43be640cf60b185b7e6a5 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 19 Sep 2019 11:36:17 +0200 Subject: [PATCH] Correct silent install/uninstall first interation --- CLIENT_DATA/delsub3264.ins | 40 ++----------------- CLIENT_DATA/opsi-PN.ini | 11 ------ CLIENT_DATA/opsi-vivaldi.browser.ini | 7 ++++ CLIENT_DATA/setup3264.ins | 58 +++------------------------- CLIENT_DATA/uninstall3264.ins | 4 +- Vivaldi.2.7.1628.33.x64.exe.sha1sum | 1 - Vivaldi.2.7.1628.33.x86.exe.sha1sum | 1 - Vivaldi.2.8.1664.35.x64.exe.sha1sum | 1 + Vivaldi.2.8.1664.35.x86.exe.sha1sum | 1 + builder-product.cfg | 6 +-- viv_icon.jpg.sha1sum | 1 - viv_icon.png.sha1sum | 2 +- 12 files changed, 25 insertions(+), 108 deletions(-) delete mode 100644 CLIENT_DATA/opsi-PN.ini create mode 100644 CLIENT_DATA/opsi-vivaldi.browser.ini delete mode 100644 Vivaldi.2.7.1628.33.x64.exe.sha1sum delete mode 100644 Vivaldi.2.7.1628.33.x86.exe.sha1sum create mode 100644 Vivaldi.2.8.1664.35.x64.exe.sha1sum create mode 100644 Vivaldi.2.8.1664.35.x86.exe.sha1sum delete mode 100644 viv_icon.jpg.sha1sum diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins index 6fb74cf..f8a02ea 100644 --- a/CLIENT_DATA/delsub3264.ins +++ b/CLIENT_DATA/delsub3264.ins @@ -72,26 +72,10 @@ 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 +"$UninstallProgramOld32$" --uninstall --vivaldi --force-uninstall [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 +"$UninstallProgram32$" --uninstall --vivaldi --force-uninstall [Files_uninstall_32] ; Example for recursively deleting the installation directory (don't forget the trailing backslash): @@ -99,26 +83,10 @@ LinkFolder_uninstall 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 +"$UninstallProgramOld64$" --uninstall --vivaldi --force-uninstall [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 +; "$UninstallProgram64$" --uninstall --vivaldi --force-uninstall [Files_uninstall_64] ; Example for recursively deleting the installation directory: diff --git a/CLIENT_DATA/opsi-PN.ini b/CLIENT_DATA/opsi-PN.ini deleted file mode 100644 index 978f02e..0000000 --- a/CLIENT_DATA/opsi-PN.ini +++ /dev/null @@ -1,11 +0,0 @@ -[X86] -MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} -MsiId32={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} - -[X86_64] -MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} -MsiId64={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} - -[COMMON] -PN=name -VERSION=version diff --git a/CLIENT_DATA/opsi-vivaldi.browser.ini b/CLIENT_DATA/opsi-vivaldi.browser.ini new file mode 100644 index 0000000..3bcccd3 --- /dev/null +++ b/CLIENT_DATA/opsi-vivaldi.browser.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 766dcad..bdef59a 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -48,8 +48,8 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; no white space use '-' as a seperator Set $MinimumSpace$ = "1 MB" ; the path were we find the product after the installation -Set $InstallDir32$ = "%ProgramFiles32Dir%\" -Set $InstallDir64$ = "%ProgramFiles64Dir%\" +Set $InstallDir32$ = "%ProgramFiles32Dir%\Vivaldi" +Set $InstallDir64$ = "%ProgramFiles64Dir%\Vivaldi" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" @@ -100,70 +100,24 @@ else 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=2 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" -; "%ScriptPath%\setup.exe" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES +"$Install32Exe$" --vivaldi-install-dir="$InstallDir32$" --vivaldi --vivaldi-silent --do-not-launch-chrome --vivaldi-update --system-level [Files_install_32] ; copy the ini file to the InstallDir copy "$IniCfgFile$" "$InstallDir32$" +copy "$Install32Exe$" "$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=2 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" -; "%ScriptPath%\setup.exe" /sp- /silent /norestart /nocancel /SUPPRESSMSGBOXES +"$Install64Exe$" --vivaldi-install-dir="$InstallDir64$" --vivaldi --vivaldi-silent --do-not-launch-chrome --vivaldi-update --system-level [Files_install_64] ; copy the ini file to the InstallDir copy "$IniCfgFile$" "$InstallDir64$" +copy "$Install64Exe$" "$InstallDir64$" ; Example of recursively copying some files into the installation directory: ; diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins index b24987d..1eba424 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -44,8 +44,8 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $InstallDir32$ = "%ProgramFiles32Dir%\" -Set $InstallDir64$ = "%ProgramFiles64Dir%\" +Set $InstallDir32$ = "%ProgramFiles32Dir%\Vivaldi" +Set $InstallDir64$ = "%ProgramFiles64Dir%\Vivaldi" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" diff --git a/Vivaldi.2.7.1628.33.x64.exe.sha1sum b/Vivaldi.2.7.1628.33.x64.exe.sha1sum deleted file mode 100644 index 7460a2c..0000000 --- a/Vivaldi.2.7.1628.33.x64.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -a2e655a5c3fc2b9e0e8fc87d78ba46450c4229c1 /home/mario/.opsi-dist-cache/vivaldi.browser-2.7.1628.33/X86_64/Vivaldi.2.7.1628.33.x64.exe diff --git a/Vivaldi.2.7.1628.33.x86.exe.sha1sum b/Vivaldi.2.7.1628.33.x86.exe.sha1sum deleted file mode 100644 index 092b288..0000000 --- a/Vivaldi.2.7.1628.33.x86.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -fc76bfc4e223a2c651b87839c8bedcc833f9082c /home/mario/.opsi-dist-cache/vivaldi.browser-2.7.1628.33/X86/Vivaldi.2.7.1628.33.x86.exe diff --git a/Vivaldi.2.8.1664.35.x64.exe.sha1sum b/Vivaldi.2.8.1664.35.x64.exe.sha1sum new file mode 100644 index 0000000..376795a --- /dev/null +++ b/Vivaldi.2.8.1664.35.x64.exe.sha1sum @@ -0,0 +1 @@ +5779c0887a24dadfa1f7dcb7756c75908038d39c /home/mario/.opsi-dist-cache/vivaldi.browser-2.8.1664.35/X86_64/Vivaldi.2.8.1664.35.x64.exe diff --git a/Vivaldi.2.8.1664.35.x86.exe.sha1sum b/Vivaldi.2.8.1664.35.x86.exe.sha1sum new file mode 100644 index 0000000..f3a68b7 --- /dev/null +++ b/Vivaldi.2.8.1664.35.x86.exe.sha1sum @@ -0,0 +1 @@ +bce4623aa3ffc12141da1b4cc213d296d1905846 /home/mario/.opsi-dist-cache/vivaldi.browser-2.8.1664.35/X86/Vivaldi.2.8.1664.35.x86.exe diff --git a/builder-product.cfg b/builder-product.cfg index 4b204c4..54e3125 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -5,7 +5,7 @@ VENDOR="vivaldi.com" PN="vivaldi.browser" NAME="Vivaldi" DESCRIPTION="Dropin Repalcement for Classic Opera" -VERSION="2.7.1628.33" +VERSION="2.8.1664.35" RELEASE="3" PRIORITY="0" ADVICE="" @@ -30,9 +30,9 @@ ICON_DL_INDEX=0 OPSI_INI_SECTION[0]="X86" OPSI_INI_OPTION[0]="UninstallProg32" -OPSI_INI_VALUE[0]="{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}" +OPSI_INI_VALUE[0]="Vivaldi.${VERSION}.x86.exe" OPSI_INI_SECTION[1]="X86_64" OPSI_INI_OPTION[1]="UninstallProg64" -OPSI_INI_VALUE[1]="{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}" +OPSI_INI_VALUE[1]="Vivaldi.${VERSION}.x64.exe" diff --git a/viv_icon.jpg.sha1sum b/viv_icon.jpg.sha1sum deleted file mode 100644 index 516a33d..0000000 --- a/viv_icon.jpg.sha1sum +++ /dev/null @@ -1 +0,0 @@ -e3bc26581e92e781b2f675a955e5334e4d4ca305 /home/mario/.opsi-dist-cache/vivaldi.browser-2.1.1337.36//viv_icon.jpg diff --git a/viv_icon.png.sha1sum b/viv_icon.png.sha1sum index b8abdd7..79c3a69 100644 --- a/viv_icon.png.sha1sum +++ b/viv_icon.png.sha1sum @@ -1 +1 @@ -9b13d9bc084ebcd7359cb4d7cf87fb70e0c6c199 /home/mario/.opsi-dist-cache/vivaldi.browser-2.5.1525.48//viv_icon.png +3ff78d4a275ee83a6bac2a44c75401857cfb79eb /home/mario/.opsi-dist-cache/vivaldi.browser-2.8.1664.35//viv_icon.png