Correct languga select

This commit is contained in:
Mario Fetka 2015-11-02 21:13:19 +01:00
parent 9d3dcd30c1
commit b7b7b65ef9
2 changed files with 12 additions and 12 deletions

View File

@ -21,16 +21,6 @@ DefVar $OLD_RELEASE$
DefStringList $languageInfo$
set $languageInfo$ = getLocaleInfoMap
DefVar $localeTransform$
if getValue("language_id_2chars", $languageInfo$) = "DE"
Set $localeTransform$ = "%ScriptPath%\Transforms\de.mst"
else
if getValue("language_id_2chars", $languageInfo$) = "EN"
Set $localeTransform$ = "%ScriptPath%\Transforms\de.mst"
endif
endif
Set $LogDir$ = "%SystemDrive%\tmp"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@ -73,7 +63,11 @@ else
comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%"
Winbatch_install
if getValue("language_id_2chars", $languageInfo$) = "DE"
Winbatch_install_de
else
Winbatch_install
endif
Sub_check_exitcode
comment "Copy files"
@ -87,8 +81,11 @@ else
endif
[Winbatch_install_de]
msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress TRANSFORMS="$TransformsPath$\de.mst"
[Winbatch_install]
msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress TRANSFORMS="$localeTransform$"
msiexec /i "$InstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=1 REBOOT=ReallySuppress
[Files_install]
; copy the ini file to the InstallDir

View File

@ -31,6 +31,9 @@ ICON_DL_INDEX=0
WINST_NAME[0]="InstallMsi"
WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1@\\FoxitReader_Enterprise.msi"
WINST_NAME[1]="TransformsPath"
WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[1@\\Transforms"
OPSI_INI_SECTION[0]="X86"
OPSI_INI_OPTION[0]="MsiId"
OPSI_INI_VALUE[0]="{98BE8556-1263-4F92-8F4E-F9C2BE58FD4C}"