change LogDir; add ProductProperty desktoplink, custom-post-install, custom-post-uninstall
This commit is contained in:
parent
78148229f6
commit
c0b84b57de
|
@ -36,6 +36,17 @@ Registry_uninstall /32Bit
|
|||
comment "Delete program shortcuts"
|
||||
LinkFolder_uninstall
|
||||
|
||||
DefVar $Property_CustomPostUninstall$
|
||||
Set $Property_CustomPostUninstall$ = getProductProperty("custom-post-uninstall","none")
|
||||
if not ($Property_CustomPostUninstall$ = "none")
|
||||
comment "Include custom post uninstall file"
|
||||
if FileExists("%ScriptPath%\custom\" + $Property_CustomPostUninstall$)
|
||||
sub_CustomPostUninstall
|
||||
else
|
||||
LogError "Include script NOT exists (" + $Property_CustomPostUninstall$ +")"
|
||||
endif
|
||||
endif
|
||||
|
||||
[Winbatch_uninstall_msi_old]
|
||||
:msiexec /x $MsiIdOld$ /qn! REBOOT=ReallySuppress CLEAN="0"
|
||||
msiexec /x $MsiIdOld$ /quiet REBOOT=ReallySuppress CLEAN="0"
|
||||
|
@ -62,9 +73,12 @@ del -sf "$InstallDir$\"
|
|||
;
|
||||
; Example of deleting a shortcut from AllUsers desktop:
|
||||
;
|
||||
; set_basefolder common_desktopdirectory
|
||||
; set_subfolder ""
|
||||
; delete_element $ProductId$
|
||||
set_basefolder common_desktopdirectory
|
||||
set_subfolder ""
|
||||
delete_element $NAME$
|
||||
|
||||
[sub_CustomPostUninstall]
|
||||
include_insert "%ScriptPath%\custom\" + $Property_CustomPostUninstall$
|
||||
|
||||
[Sub_check_exitcode]
|
||||
comment "Test for installation success via exit code"
|
||||
|
|
|
@ -18,10 +18,14 @@ DefVar $OLD_VERSION$
|
|||
DefVar $OLD_CREATOR_TAG$
|
||||
DefVar $OLD_RELEASE$
|
||||
|
||||
;Property Variables
|
||||
DefVar $Property_CustomPostInstall$
|
||||
DefVar $Property_DesktopLink$
|
||||
|
||||
DefStringList $languageInfo$
|
||||
set $languageInfo$ = getLocaleInfoMap
|
||||
|
||||
Set $LogDir$ = "%SystemDrive%\tmp"
|
||||
Set $LogDir$ = "%opsiLogDir%"
|
||||
|
||||
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
|
||||
; and adds the following variables:
|
||||
|
@ -75,9 +79,22 @@ else
|
|||
|
||||
comment "Patch Registry"
|
||||
Registry_install /32Bit
|
||||
|
||||
Set $Property_DesktopLink$ = GetProductProperty("DesktopLink","false")
|
||||
if ($Property_DesktopLink$ = "false")
|
||||
comment "Create shortcuts"
|
||||
LinkFolder_install
|
||||
endif
|
||||
|
||||
comment "Create shortcuts"
|
||||
LinkFolder_install
|
||||
Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none")
|
||||
if not ($Property_CustomPostInstall$ = "none")
|
||||
comment "Include custom post install file"
|
||||
if FileExists("%ScriptPath%\custom\" + $Property_CustomPostInstall$)
|
||||
sub_CustomPostInstall
|
||||
else
|
||||
LogError "Include script NOT exists (" + $Property_CustomPostInstall$ +")"
|
||||
endif
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
|
@ -106,7 +123,7 @@ copy "$IniCfgFile$" "$InstallDir$"
|
|||
[LinkFolder_install]
|
||||
set_basefolder common_desktopdirectory
|
||||
set_subfolder ""
|
||||
delete_element "Foxit Reader"
|
||||
delete_element $NAME$
|
||||
|
||||
; Example of deleting a folder from AllUsers startmenu:
|
||||
;
|
||||
|
@ -141,6 +158,9 @@ delete_element "Foxit Reader"
|
|||
; icon_index: 2
|
||||
; end_link
|
||||
|
||||
[sub_CustomPostInstall]
|
||||
include_insert "%ScriptPath%\custom\" + $Property_CustomPostInstall$
|
||||
|
||||
[Sub_check_exitcode]
|
||||
comment "Test for installation success via exit code"
|
||||
set $ExitCode$ = getLastExitCode
|
||||
|
|
|
@ -17,7 +17,7 @@ DefVar $OLD_VERSION$
|
|||
DefVar $OLD_CREATOR_TAG$
|
||||
DefVar $OLD_RELEASE$
|
||||
|
||||
Set $LogDir$ = "%SystemDrive%\tmp"
|
||||
Set $LogDir$ = "%opsiLogDir%"
|
||||
|
||||
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
|
||||
; and adds the following variables:
|
||||
|
|
24
OPSI/control
24
OPSI/control
|
@ -21,6 +21,30 @@ onceScript:
|
|||
customScript:
|
||||
userLoginScript:
|
||||
|
||||
[ProductProperty]
|
||||
type: bool
|
||||
name: desktoplink
|
||||
description: Show Desktop Link on/off
|
||||
default: False
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: custom-post-install
|
||||
multivalue: False
|
||||
editable: True
|
||||
description: Define filename for include script in custom directory after installation
|
||||
values: ["none"]
|
||||
default: ["none"]
|
||||
|
||||
[ProductProperty]
|
||||
type: unicode
|
||||
name: custom-post-uninstall
|
||||
multivalue: False
|
||||
editable: True
|
||||
description: Define filename for include script in custom directory after uninstallation
|
||||
values: ["none"]
|
||||
default: ["none"]
|
||||
|
||||
[ProductDependency]
|
||||
action: setup
|
||||
requiredProduct: sereby.aio
|
||||
|
|
Loading…
Reference in New Issue