From f7b70a0f711988fbe87cbebbad25ceba5931677e Mon Sep 17 00:00:00 2001
From: Peter Singer <silc@gmx.net>
Date: Fri, 14 Dec 2012 20:08:22 +0100
Subject: [PATCH] Updated version and language selection for german
---
CLIENT_DATA/X86/i_view32.ini | 3 +++
CLIENT_DATA/delsub32.ins | 3 +++
CLIENT_DATA/setup32.ins | 25 +++++++++++++++++++++++--
OPSI/control | 8 ++++++++
builder-product.cfg | 12 ++++++------
irfanview_plugins_433_setup.exe.sha1sum | 1 -
irfanview_plugins_435_setup.exe.sha1sum | 1 +
iview433_setup.exe.sha1sum | 1 -
iview435_setup.exe.sha1sum | 1 +
preview-29-1353-280.jpg.sha1sum | 2 +-
10 files changed, 46 insertions(+), 11 deletions(-)
create mode 100644 CLIENT_DATA/X86/i_view32.ini
delete mode 100644 irfanview_plugins_433_setup.exe.sha1sum
create mode 100644 irfanview_plugins_435_setup.exe.sha1sum
delete mode 100644 iview433_setup.exe.sha1sum
create mode 100644 iview435_setup.exe.sha1sum
diff --git a/CLIENT_DATA/X86/i_view32.ini b/CLIENT_DATA/X86/i_view32.ini
new file mode 100644
index 0000000..3215c1d
--- /dev/null
+++ b/CLIENT_DATA/X86/i_view32.ini
@@ -0,0 +1,3 @@
+[Language]
+DLL=DEUTSCH.DLL
+Lang=Deutsch
diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index 9f2533e..5c279e1 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -33,6 +33,9 @@ LinkFolder_uninstall
;
; delete -sf "$InstallDir$\"
+; Delete files for german
+delete -sf "%ProfileDir%\Default User\Anwendungsdaten\irfanview"
+
[Registry_uninstall]
; Example of deleting a registry key:
;
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 766297b..b239eb2 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -15,6 +15,9 @@ DefVar $ExitCode$
Set $LogDir$ = "%SystemDrive%\tmp"
+DefVar $language$
+Set $language$ = GetProductProperty("language", "german")
+
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
; and adds the following variables:
; from builder-product.cfg : all variables definded by attribute WINST[index]
@@ -56,9 +59,18 @@ else
Winbatch_install
Sub_check_exitcode
+ comment "Installation for german language"
+ if ($language$ = "german")
+ Message "Set german language..."
+ Files_install_german /AllNTUserProfiles
+ comment "Clean useless files and directories"
+ Files_delete_AllNTUser_german
+ Dosbatch_delete_AllNTUser_german
+ endif
+
comment "Copy files"
Files_install /32Bit
-
+
comment "Patch Registry"
Registry_install /32Bit
@@ -80,14 +92,23 @@ endif
; Choose one of the following examples as basis for your installation
; You can use $LicenseKey$ var to pass a license key to the installer
;
-"$InstallExe$" /silent /folder="$InstallDir$" /desktop=1 /thumbs=1 /group=1 /allusers=1 /assoc=1 /assocallusers=1 /ini="%AppdataDir%\irfanview"
+"$InstallExe$" /silent /folder="$InstallDir$" /desktop=1 /thumbs=0 /group=1 /allusers=1 /assoc=1 /assocallusers=1 /ini="%APPDATA%\irfanview"
"$InstallPluginsExe$" /silent
+[Dosbatch_delete_AllNTUser_german]
+rd "%ProfileDir%\Public\Anwendungsdaten"
+
[Files_install]
; Example of recursively copying some files into the installation directory:
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
+[Files_install_german]
+copy "%ScriptPath%\X86\i_view32.ini" "%UserProfileDir%\Anwendungsdaten\irfanview"
+
+[Files_delete_AllNTUser_german]
+delete -sf "%ProfileDir%\Public\Anwendungsdaten\irfanview"
+
[Registry_install]
; Example of setting some values of an registry key:
;
diff --git a/OPSI/control b/OPSI/control
index 30de8b7..d13fa26 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -30,3 +30,11 @@ description: which architecture (32/64 bit) has to be installed
values: ["32 only", "64 only", "both", "system specific"]
default: ["system specific"]
+[ProductProperty]
+type: unicode
+name: language
+multivalue: False
+editable: False
+description: Language selection
+values: ["default", "german"]
+default: ["german"]
diff --git a/builder-product.cfg b/builder-product.cfg
index 24af5b2..b1bc020 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,8 +3,8 @@
############################
VENDOR="irfanview.tuwien.ac.at"
PN="irfanview.irfanview"
-VERSION="4.33"
-RELEASE="3"
+VERSION="4.35"
+RELEASE="1"
PRIORITY="0"
ADVICE=""
@@ -16,13 +16,13 @@ TYPE="public"
DL_FILE[0]="preview-29-1353-280.jpg"
DL_SOURCE[0]="http://skins13.wincustomize.com/6/89/689332/29/1353/preview-29-1353-280.jpg"
-DL_FILE[1]="iview433_setup.exe"
-DL_SOURCE[1]="http://irfanview.tuwien.ac.at/iview433_setup.exe"
+DL_FILE[1]="iview435_setup.exe"
+DL_SOURCE[1]="http://irfanview.tuwien.ac.at/iview435_setup.exe"
DL_ARCH[1]="X86"
DL_WINST_NAME[1]=InstallExe
-DL_FILE[2]="irfanview_plugins_433_setup.exe"
-DL_SOURCE[2]="http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_433_setup.exe"
+DL_FILE[2]="irfanview_plugins_435_setup.exe"
+DL_SOURCE[2]="http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_435_setup.exe"
DL_ARCH[2]="X86"
DL_WINST_NAME[2]=InstallPluginsExe
diff --git a/irfanview_plugins_433_setup.exe.sha1sum b/irfanview_plugins_433_setup.exe.sha1sum
deleted file mode 100644
index a1cb37c..0000000
--- a/irfanview_plugins_433_setup.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-f76828edbcc3f3b98507298bd4fe975863a2833e /home/mario/.opsi-dist-cache/irfanview-4.33/X86/irfanview_plugins_433_setup.exe
diff --git a/irfanview_plugins_435_setup.exe.sha1sum b/irfanview_plugins_435_setup.exe.sha1sum
new file mode 100644
index 0000000..946404c
--- /dev/null
+++ b/irfanview_plugins_435_setup.exe.sha1sum
@@ -0,0 +1 @@
+d2c65ef987f324acd4ba56429a689f9c0160bf4e /home/opsiproducts/.opsi-dist-cache/irfanview.irfanview-4.35/X86/irfanview_plugins_435_setup.exe
diff --git a/iview433_setup.exe.sha1sum b/iview433_setup.exe.sha1sum
deleted file mode 100644
index f9d72f7..0000000
--- a/iview433_setup.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-79a7ebe2325ad204712761aa3c3a072025b07784 /home/mario/.opsi-dist-cache/irfanview-4.33/X86/iview433_setup.exe
diff --git a/iview435_setup.exe.sha1sum b/iview435_setup.exe.sha1sum
new file mode 100644
index 0000000..3a04d02
--- /dev/null
+++ b/iview435_setup.exe.sha1sum
@@ -0,0 +1 @@
+7c88945853910be1c19ac8c9864501200ea2851a /home/opsiproducts/.opsi-dist-cache/irfanview.irfanview-4.35/X86/iview435_setup.exe
diff --git a/preview-29-1353-280.jpg.sha1sum b/preview-29-1353-280.jpg.sha1sum
index a1138f3..c6afce7 100644
--- a/preview-29-1353-280.jpg.sha1sum
+++ b/preview-29-1353-280.jpg.sha1sum
@@ -1 +1 @@
-b9301bcf49d58f97fcfe9d017e88e28393d183ab /home/mario/.opsi-dist-cache/irfanview-4.33//preview-29-1353-280.jpg
+b9301bcf49d58f97fcfe9d017e88e28393d183ab /home/opsiproducts/.opsi-dist-cache/irfanview.irfanview-4.35//preview-29-1353-280.jpg