go-opsi/piriform.defraggler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use correct language on install

Browse Source
This commit is contained in:
Mario Fetka 2013-04-30 19:34:28 +02:00
parent 12bc231731
commit e5fedd10b0
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CLIENT_DATA/delsub3264.ins
View File

@ -23,13 +23,13 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$
if FileExists($UninstallProgramOld32$) if FileExists($UninstallProgramOld32$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_old_32 Winbatch_uninstall_old_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
sub_check_exitcode sub_check_exitcode
endif endif
endif endif
if FileExists($UninstallProgram32$) if FileExists($UninstallProgram32$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_32 Winbatch_uninstall_32 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
sub_check_exitcode sub_check_exitcode
endif endif
@ -52,13 +52,13 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$ Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$
if FileExists($UninstallProgramOld64$) if FileExists($UninstallProgramOld64$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_old_64 Winbatch_uninstall_old_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
sub_check_exitcode sub_check_exitcode
endif endif
endif endif
if FileExists($UninstallProgram64$) if FileExists($UninstallProgram64$)
comment "Uninstall program found, starting uninstall" comment "Uninstall program found, starting uninstall"
Winbatch_uninstall_64 Winbatch_uninstall_64 /WaitforProcessending "Au_.exe" /Timeoutseconds 10
sub_check_exitcode sub_check_exitcode
endif endif

11
CLIENT_DATA/setup3264.ins
View File

@ -25,6 +25,11 @@ DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$ DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$ DefVar $OLD_RELEASE$
DefStringList $languageInfo$
set $languageInfo$ = getLocaleInfoMap
DefVar $LanguageId$
set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
Set $INST_SystemType$ = GetSystemType Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific") set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
@ -100,22 +105,24 @@ else
endif endif
[Winbatch_install_32] [Winbatch_install_32]
"$InstallExe$" /S "$InstallExe$" /S /D="$InstallDir32$" /L=$LanguageId$
[Files_install_32] [Files_install_32]
; copy the ini file to the InstallDir ; copy the ini file to the InstallDir
copy "$IniCfgFile$" "$InstallDir32$" copy "$IniCfgFile$" "$InstallDir32$"
copy "%ScriptPath%\defraggler.ini" "$InstallDir32$"
; Example of recursively copying some files into the installation directory: ; Example of recursively copying some files into the installation directory:
; ;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" ; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
[Winbatch_install_64] [Winbatch_install_64]
"$InstallExe$" /S "$InstallExe$" /S /D="$InstallDir64$" /L=$LanguageId$
[Files_install_64] [Files_install_64]
; copy the ini file to the InstallDir ; copy the ini file to the InstallDir
copy "$IniCfgFile$" "$InstallDir64$" copy "$IniCfgFile$" "$InstallDir64$"
copy "%ScriptPath%\defraggler.ini" "$InstallDir64$"
; Example of recursively copying some files into the installation directory: ; Example of recursively copying some files into the installation directory:
; ;

6
builder-product.cfg
View File

@ -5,7 +5,7 @@ VENDOR="piriform.com"
PN="piriform.defraggler" PN="piriform.defraggler"
NAME="Defraggler" NAME="Defraggler"
DESCRIPTION="Use Defraggler to defrag your entire hard drive, or individual files - unique in the industry." DESCRIPTION="Use Defraggler to defrag your entire hard drive, or individual files - unique in the industry."
VERSION="2.13.670" VERSION="2.14.706"
RELEASE="1" RELEASE="1"
PRIORITY="0" PRIORITY="0"
ADVICE="" ADVICE=""
@ -34,3 +34,7 @@ OPSI_INI_VALUE[0]="uninst.exe"
OPSI_INI_SECTION[1]="X86_64" OPSI_INI_SECTION[1]="X86_64"
OPSI_INI_OPTION[1]="UninstallProg64" OPSI_INI_OPTION[1]="UninstallProg64"
OPSI_INI_VALUE[1]="uninst.exe" OPSI_INI_VALUE[1]="uninst.exe"
OPSI_INI_SECTION[2]="Options"
OPSI_INI_OPTION[2]="UpdateCheck"
OPSI_INI_VALUE[2]="0"

6
builder-targets-cb.sh
View File

@ -23,3 +23,9 @@ function cleanup() {
echo "Cleanup" echo "Cleanup"
builder_cleanup builder_cleanup
} }
function create() {
echo "Create"
builder_create
cp $INST_DIR/CLIENT_DATA/opsi-${PN}.ini $INST_DIR/CLIENT_DATA/defraggler.ini
}