From 1c1b6d450d15fdbb9bdfefa060a6949a110ab1b0 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sun, 26 Feb 2012 16:02:32 +0100 Subject: [PATCH] Bump and move to serebys light version (no advertisments) --- AdbeRdr1010_de_DE.msi.sha1sum | 1 - AdobeAcrobatReaderCS3Overlay.png.sha1sum | 1 - CLIENT_DATA/delsub32.ins | 16 ------- CLIENT_DATA/setup32.ins | 55 ------------------------ CLIENT_DATA/uninstall32.ins | 31 ------------- acrobatreader.png.sha1sum | 1 + arxlite_deu-10.1.2.0.exe.sha1sum | 1 + builder-product.cfg | 17 +++++--- 8 files changed, 12 insertions(+), 111 deletions(-) delete mode 100644 AdbeRdr1010_de_DE.msi.sha1sum delete mode 100644 AdobeAcrobatReaderCS3Overlay.png.sha1sum create mode 100644 acrobatreader.png.sha1sum create mode 100644 arxlite_deu-10.1.2.0.exe.sha1sum diff --git a/AdbeRdr1010_de_DE.msi.sha1sum b/AdbeRdr1010_de_DE.msi.sha1sum deleted file mode 100644 index 959ce00..0000000 --- a/AdbeRdr1010_de_DE.msi.sha1sum +++ /dev/null @@ -1 +0,0 @@ -99aeb11efcdfc3b8ec5ea1ae0a10c02dca5b8daf /usr/portage/distfiles/AdbeRdr1010_de_DE.msi diff --git a/AdobeAcrobatReaderCS3Overlay.png.sha1sum b/AdobeAcrobatReaderCS3Overlay.png.sha1sum deleted file mode 100644 index a986b60..0000000 --- a/AdobeAcrobatReaderCS3Overlay.png.sha1sum +++ /dev/null @@ -1 +0,0 @@ -96336bf236d0519c9c3c4b91d5ca9090a9cbaee3 AdobeAcrobatReaderCS3Overlay.png diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 6c13f14..1dc3e1c 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -5,15 +5,9 @@ Set $MsiId$ = '{AC76BA86-7AD7-1031-7B44-AA1000000001}' -Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" Message "Uninstalling " + $ProductId$ + " ..." -if FileExists($UninstallProgram$) - comment "Uninstall program found, starting uninstall" - 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 @@ -29,16 +23,6 @@ Registry_uninstall /32Bit comment "Delete program shortcuts" LinkFolder_uninstall -[Winbatch_uninstall] -; Choose one of the following examples as basis for program uninstall -; -; === Nullsoft Scriptable Install System ================================================================ -; "$UninstallProgram$" /S -; -; === Inno Setup ======================================================================================== -; "$UninstallProgram$" /silent /norestart - - [Winbatch_uninstall_msi] msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 787ad93..8a31432 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -7,15 +7,11 @@ requiredWinstVersion >= "4.10.8.6" DefVar $MsiId$ -DefVar $UninstallProgram$ DefVar $LogDir$ DefVar $ProductId$ DefVar $MinimumSpace$ DefVar $InstallDir$ DefVar $ExitCode$ -DefVar $LicenseRequired$ -DefVar $LicenseKey$ -DefVar $LicensePool$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -39,8 +35,6 @@ Set $ProductId$ = "acroreader" Set $MinimumSpace$ = "150 MB" ; the path were we find the product after the installation Set $InstallDir$ = "%ProgramFiles32Dir%\Adobe\Reader 10.0\Reader\" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) @@ -58,11 +52,6 @@ else Message "Installing " + $ProductId$ + " ..." - if $LicenseRequired$ = "true" - comment "Licensing required, reserve license and get license key" - Sub_get_licensekey - endif - comment "Start setup program" Winbatch_install Sub_check_exitcode @@ -88,13 +77,7 @@ else endif [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 -; -; === MSI package ======================================================================================= -; You may use the parameter PIDKEY=$Licensekey$ msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress EULA_ACCEPT=YES -; [Files_install] ; Example of recursively copying some files into the installation directory: @@ -143,44 +126,6 @@ set "bProtectedMode" = REG_DWORD:0000 ; 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 049aaa9..64a5fe2 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -7,13 +7,10 @@ requiredWinstVersion >= "4.10.8.6" DefVar $MsiId$ -DefVar $UninstallProgram$ DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ DefVar $InstallDir$ -DefVar $LicenseRequired$ -DefVar $LicensePool$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -22,8 +19,6 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- Set $ProductId$ = "acroreader" Set $InstallDir$ = "%ProgramFiles32Dir%\Adobe\Reader 10.0\Reader\" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- @@ -37,29 +32,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] -if opsiLicenseManagementEnabled - 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$) -else - LogError "Error: licensing required, but license management not enabled" - isFatalError -endif - - - diff --git a/acrobatreader.png.sha1sum b/acrobatreader.png.sha1sum new file mode 100644 index 0000000..a4a919f --- /dev/null +++ b/acrobatreader.png.sha1sum @@ -0,0 +1 @@ +055ec678ac3abca0aec4544db2717d702f581096 /home/mario/.opsi-dist-cache/acroreader-10.1.2.0//acrobatreader.png diff --git a/arxlite_deu-10.1.2.0.exe.sha1sum b/arxlite_deu-10.1.2.0.exe.sha1sum new file mode 100644 index 0000000..84785be --- /dev/null +++ b/arxlite_deu-10.1.2.0.exe.sha1sum @@ -0,0 +1 @@ +c14facf8d579e4b4864d35be4a5cd5d7e051f489 /home/mario/.opsi-dist-cache/acroreader-10.1.2.0/X86/arxlite_deu-10.1.2.0.exe diff --git a/builder-product.cfg b/builder-product.cfg index 31c6399..4df8367 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,8 +3,8 @@ ############################ VENDOR="adobe.com" PN="acroreader" -VERSION="10.1.0" -RELEASE="2" +VERSION="10.1.2.0" +RELEASE="1" PRIORITY="0" ADVICE="" @@ -12,14 +12,17 @@ ADVICE="" # Valid value: restricted | public TYPE="public" -DL_FILE[0]="AdobeAcrobatReaderCS3Overlay.png" -DL_SOURCE[0]="http://www.veryicon.com/icon/png/Folder/Pry%20CS3/Adobe%20Acrobat%20Reader%20CS3%20Overlay.png" +DL_FILE[0]="acrobatreader.png" +DL_SOURCE[0]="http://www.veryicon.com/icon/png/Application/Windows%20Icons%20V2%20programs/acrobatreader.png" -DL_FILE[1]="AdbeRdr1010_de_DE.msi" -DL_SOURCE[1]="ftp://ftp.adobe.com/pub/adobe/reader/win/10.x/10.1.0/de_DE/AdbeRdr1010_de_DE.msi" +DL_FILE[1]="arxlite_deu-${VERSION}.exe" +DL_SOURCE[1]="http://www.sereby.org/_downloads/arxlite_deu.exe" DL_ARCH[1]="X86" -DL_WINST_NAME[1]=InstallMsi +DL_DOWNLOADER[1]="wget" +DL_EXTRACT_FORMAT[1]="7zip" # File array index for the image showing while installing the program ICON_DL_INDEX=0 +WINST_NAME[0]="InstallMsi" +WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\AcroRead.msi"