From 28be0958fc6023d861a71f0c9509ed5684142c84 Mon Sep 17 00:00:00 2001 From: Peter Singer Date: Wed, 27 Mar 2013 11:07:06 +0100 Subject: [PATCH] Added default config file for all profiles , corrected 64 bit links --- CLIENT_DATA/setup3264.ins | 17 +++++++++++++++-- CLIENT_DATA/uninstall3264.ins | 4 ++-- builder-product.cfg | 4 +++- builder-targets-cb.sh | 4 ++-- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 78670b8..22735c2 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -77,6 +77,8 @@ else ; Sub_check_exitcode comment "Copy files" Files_install_32 /32Bit + Files_install_config /AllNtUserProfiles + Dosbatch_set_config_32 comment "Patch Registry" Registry_install /32Bit comment "Create shortcuts" @@ -91,6 +93,8 @@ else ; Sub_check_exitcode comment "Copy files" Files_install_64 /64Bit + Files_install_config /AllNTUserProfiles + Dosbatch_set_config_64 comment "Patch Registry" Registry_install /64Bit comment "Create shortcuts" @@ -99,6 +103,9 @@ else endif +[Files_install_config] +copy "%ScriptPath%\Imagine.ini" "%UserProfileDir%\Anwendungsdaten\Imagine" + [Winbatch_install_32] "$Install32Exe$" /S /D="$InstallDir32$" @@ -111,6 +118,9 @@ copy "%ScriptPath%\*.ini" "$InstallDir32$" ; copy -s "%ScriptPath%\X86\*.*" "$InstallDir32$" +[Dosbatch_set_config_32] +attrib +r "$InstallDir32$\Imagine.ini" + [Winbatch_install_64] "$Install64Exe$" /S /D="$InstallDir64$" @@ -123,6 +133,9 @@ copy "%ScriptPath%\*.ini" "$InstallDir64$" ; copy -s "%ScriptPath%\X86_64\*.*" "$InstallDir64$" +[Dosbatch_set_config_64] +attrib +r "$InstallDir64$\Imagine.ini" + [Registry_install] ; Example of setting some values of an registry key: ; @@ -179,7 +192,7 @@ set_subfolder $NAME$ ; set_link name: $NAME$ - target: "$InstallDir64$\Imagine.exe" + target: "$InstallDir64$\Imagine64.exe" parameters: working_dir: $InstallDir64$ icon_file: @@ -193,7 +206,7 @@ set_subfolder "" ; set_link name: $NAME$ - target: "$InstallDir64$\Imagine.exe" + target: "$InstallDir64$\Imagine64.exe" parameters: working_dir: $InstallDir64$ icon_file: diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins index d81a284..6046cfc 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -6,11 +6,11 @@ [Actions] requiredWinstVersion >= "4.11.2.6" -DefVar $UninstallProg32$ +; DefVar $UninstallProg32$ DefVar $UninstallProgram32$ DefVar $UninstallProgramOld32$ DefVar $IniFile32$ -DefVar $UninstallProg64$ +; DefVar $UninstallProg64$ DefVar $UninstallProgram64$ DefVar $UninstallProgramOld64$ DefVar $IniFile64$ diff --git a/builder-product.cfg b/builder-product.cfg index f09dd75..0abbc9a 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -150,4 +150,6 @@ OPSI_INI_SECTION[3]="Option" OPSI_INI_OPTION[3]="IndividualOptionPerUser" OPSI_INI_VALUE[3]="1" - +OPSI_INI_SECTION[4]="Language" +OPSI_INI_OPTION[4]="TextFile" +OPSI_INI_VALUE[4]="German.lng" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 4b39906..0111ad1 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -26,5 +26,5 @@ function cleanup() { function create() { echo "Create" builder_create - cp $INST_DIR/CLIENT_DATA/opsi-${PN}.ini $INST_DIR/CLIENT_DATA/imagine.ini -} \ No newline at end of file + cp $INST_DIR/CLIENT_DATA/opsi-${PN}.ini $INST_DIR/CLIENT_DATA/Imagine.ini +}