From 75caa95bcaeb5d417cfca29e86ed2e77465268e9 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 4 Jan 2019 13:26:10 +0100 Subject: [PATCH] Bump --- .../X86/{pdfcreator-1.6.1.ini => pdfcreator-3.3.2.ini} | 0 CLIENT_DATA/setup32.ins | 8 ++++---- OPSI/control | 4 ++-- PDFCreator-1.6.1_setup.exe.sha1sum | 1 - builder-product.cfg | 10 +++++----- 5 files changed, 11 insertions(+), 12 deletions(-) rename CLIENT_DATA/X86/{pdfcreator-1.6.1.ini => pdfcreator-3.3.2.ini} (100%) delete mode 100644 PDFCreator-1.6.1_setup.exe.sha1sum diff --git a/CLIENT_DATA/X86/pdfcreator-1.6.1.ini b/CLIENT_DATA/X86/pdfcreator-3.3.2.ini similarity index 100% rename from CLIENT_DATA/X86/pdfcreator-1.6.1.ini rename to CLIENT_DATA/X86/pdfcreator-3.3.2.ini diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index b10c670..99e3019 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -25,7 +25,7 @@ DefVar $LicensePool$ Set $LogDir$ = "%SystemDrive%\tmp" DefVar $pp_version$ -Set $pp_version$ = GetProductProperty("pp_version", "1.6.1") +Set $pp_version$ = GetProductProperty("pp_version", "3.3.2") ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; and adds the following variables: @@ -48,7 +48,7 @@ Set $MinimumSpace$ = "50 MB" ; the path were we find the product after the installation Set $InstallDir$ = "%ProgramFiles32Dir%\PDFCreator" Set $Inst_Cmd$ = '/SILENT /NOCANCEL /LANG=De /NORESTART /LOADINF=%ScriptPath%\X86\pdfcreator-1.5.1.ini' -Set $Inst_Cmd2$ = '/SILENT /NOCANCEL /LANG=De /NORESTART /LOADINF=%ScriptPath%\X86\pdfcreator-1.6.1.ini' +Set $Inst_Cmd2$ = '/SILENT /NOCANCEL /LANG=De /NORESTART /LOADINF=%ScriptPath%\X86\pdfcreator-3.3.2.ini' Set $LicenseRequired$ = "false" Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- @@ -80,8 +80,8 @@ else Sub_check_exitcode endif - if ($pp_version$ = "1.6.1") - Message "Installing " + $ProductId$ + " 1.6.1 ..." + if ($pp_version$ = "3.3.2") + Message "Installing " + $ProductId$ + " 3.3.2 ..." Winbatch_install_2 Sub_check_exitcode endif diff --git a/OPSI/control b/OPSI/control index ae522d9..6f0dbcf 100644 --- a/OPSI/control +++ b/OPSI/control @@ -42,5 +42,5 @@ name: pp_version multivalue: False editable: False description: Set version to install (1.5.1 comes with pdf architect) -values: ["1.5.1", "1.6.1"] -default: ["1.6.1"] +values: ["1.5.1", "3.3.2"] +default: ["3.3.2"] diff --git a/PDFCreator-1.6.1_setup.exe.sha1sum b/PDFCreator-1.6.1_setup.exe.sha1sum deleted file mode 100644 index 9120bef..0000000 --- a/PDFCreator-1.6.1_setup.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -64131ebce68286baaefac74f12628ebfc159b7cb /home/opsiproducts/.opsi-dist-cache/pdfforge.pdfcreator-1.6.1/X86/PDFCreator-1.6.1_setup.exe diff --git a/builder-product.cfg b/builder-product.cfg index 0ea7f6e..9087c82 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,7 +3,7 @@ ############################ VENDOR="pdfforge.org" PN="pdfforge.pdfcreator" -VERSION="1.6.1" +VERSION="3.3.2" RELEASE="1" PRIORITY="0" ADVICE="" @@ -13,16 +13,16 @@ ADVICE="" TYPE="public" -DL_FILE[0]="PDFCreator.jpg" -DL_SOURCE[0]="http://srcweb.net/wp-content/uploads/2011/01/PDFCreator.jpg" +DL_FILE[0]="pdfcreator-logo-big.png" +DL_SOURCE[0]="https://cdn.pdfforge.org/sites/default/files/pdfcreator/3/logo/pdfcreator-logo-big.png" DL_FILE[1]="PDFCreator-1.5.1_setup.exe" -DL_SOURCE[1]="http://white.download.pdfforge.org/pdfcreator/1.5.1/PDFCreator-1_5_1_setup.exe" +DL_SOURCE[1]="https://sourceforge.net/projects/pdfcreator/files/PDFCreator/PDFCreator%201.5.1/PDFCreator-1_5_1_setup.exe" DL_ARCH[1]="X86" DL_WINST_NAME[1]=InstallExe DL_FILE[2]="PDFCreator-${VERSION}_setup.exe" -DL_SOURCE[2]="http://white.download.pdfforge.org/pdfcreator/1.6.1/PDFCreator-1_6_1_setup.exe" +DL_SOURCE[2]="https://white.download.pdfforge.org/pdfcreator/${VERSION}/PDFCreator-${VERSION//./_}-Setup.exe" DL_ARCH[2]="X86" DL_WINST_NAME[2]=InstallExe2