filetyp assoc into Property correct typo in control file

This commit is contained in:
Mario Fetka 2019-10-21 16:25:46 +02:00
parent 5efc4e731f
commit 766a1e5c3f
10 changed files with 57 additions and 17 deletions

View File

@ -78,8 +78,11 @@ Registry_uninstall /32Bit
comment "Delete program shortcuts" comment "Delete program shortcuts"
LinkFolder_uninstall LinkFolder_uninstall
comment "File Type Association" Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
DosInAnIcon_FileTypeAssoc_uninstall if ($Property_FileTypeAssociation$ = "true")
comment "File Type Association"
DosInAnIcon_FileTypeAssoc_uninstall
endif
DefVar $Property_CustomPostUninstall$ DefVar $Property_CustomPostUninstall$
Set $Property_CustomPostUninstall$ = getProductProperty("custom-post-uninstall","none") Set $Property_CustomPostUninstall$ = getProductProperty("custom-post-uninstall","none")

View File

@ -76,8 +76,11 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
Files_uninstall_32 /32Bit Files_uninstall_32 /32Bit
comment "Cleanup registry" comment "Cleanup registry"
Registry_uninstall /32Bit Registry_uninstall /32Bit
Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
if ($Property_FileTypeAssociation$ = "true")
comment "File Type Association" comment "File Type Association"
DosInAnIcon_FileTypeAssoc_uninstall DosInAnIcon_FileTypeAssoc_uninstall
endif
endif endif
if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
@ -145,8 +148,12 @@ if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system spe
Files_uninstall_64 /64Bit Files_uninstall_64 /64Bit
comment "Cleanup registry" comment "Cleanup registry"
Registry_uninstall /64Bit Registry_uninstall /64Bit
Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
if ($Property_FileTypeAssociation$ = "true")
comment "File Type Association" comment "File Type Association"
DosInAnIcon_FileTypeAssoc_uninstall DosInAnIcon_FileTypeAssoc_uninstall
endif
endif endif
comment "Delete program shortcuts" comment "Delete program shortcuts"

View File

@ -78,8 +78,11 @@ Registry_uninstall /64Bit
comment "Delete program shortcuts" comment "Delete program shortcuts"
LinkFolder_uninstall LinkFolder_uninstall
comment "File Type Association" Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
DosInAnIcon_FileTypeAssoc_uninstall if ($Property_FileTypeAssociation$ = "true")
comment "File Type Association"
DosInAnIcon_FileTypeAssoc_uninstall
endif
DefVar $Property_CustomPostUninstall$ DefVar $Property_CustomPostUninstall$
Set $Property_CustomPostUninstall$ = getProductProperty("custom-post-uninstall","none") Set $Property_CustomPostUninstall$ = getProductProperty("custom-post-uninstall","none")

View File

@ -37,6 +37,7 @@ set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
;Property Variables ;Property Variables
DefVar $Property_CustomPostInstall$ DefVar $Property_CustomPostInstall$
DefVar $Property_DesktopLink$ DefVar $Property_DesktopLink$
DefVar $Property_FileTypeAssociation$
Set $LogDir$ = "%opsiLogDir%" Set $LogDir$ = "%opsiLogDir%"
@ -129,8 +130,11 @@ else
LinkFolder_install_DesktopLink LinkFolder_install_DesktopLink
endif endif
Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
if ($Property_FileTypeAssociation$ = "true")
comment "File Type Association" comment "File Type Association"
DosInAnIcon_FileTypeAssoc_install DosInAnIcon_FileTypeAssoc_install
endif
Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none") Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none")
if not ($Property_CustomPostInstall$ = "none") if not ($Property_CustomPostInstall$ = "none")

View File

@ -47,6 +47,7 @@ set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
;Property Variables ;Property Variables
DefVar $Property_CustomPostInstall$ DefVar $Property_CustomPostInstall$
DefVar $Property_DesktopLink$ DefVar $Property_DesktopLink$
DefVar $Property_FileTypeAssociation$
Set $LogDir$ = "%opsiLogDir%" Set $LogDir$ = "%opsiLogDir%"
@ -135,9 +136,12 @@ else
if ($Property_DesktopLink$ = "true") if ($Property_DesktopLink$ = "true")
LinkFolder_install_DesktopLink_32 LinkFolder_install_DesktopLink_32
endif endif
Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
if ($Property_FileTypeAssociation$ = "true")
comment "File Type Association" comment "File Type Association"
DosInAnIcon_FileTypeAssoc_install DosInAnIcon_FileTypeAssoc_install
endif endif
endif
if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
@ -163,9 +167,12 @@ else
if ($Property_DesktopLink$ = "true") if ($Property_DesktopLink$ = "true")
LinkFolder_install_DesktopLink_64 LinkFolder_install_DesktopLink_64
endif endif
Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
if ($Property_FileTypeAssociation$ = "true")
comment "File Type Association" comment "File Type Association"
DosInAnIcon_FileTypeAssoc_install DosInAnIcon_FileTypeAssoc_install
endif endif
endif
Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none") Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none")
if not ($Property_CustomPostInstall$ = "none") if not ($Property_CustomPostInstall$ = "none")

View File

@ -37,6 +37,7 @@ set $LanguageId$ = getValue("default_language_id_decimal", $languageInfo$)
;Property Variables ;Property Variables
DefVar $Property_CustomPostInstall$ DefVar $Property_CustomPostInstall$
DefVar $Property_DesktopLink$ DefVar $Property_DesktopLink$
DefVar $Property_FileTypeAssociation$
Set $LogDir$ = "%opsiLogDir%" Set $LogDir$ = "%opsiLogDir%"
@ -129,8 +130,11 @@ else
LinkFolder_install_DesktopLink LinkFolder_install_DesktopLink
endif endif
Set $Property_FileTypeAssociation$ = GetProductProperty("FileTypeAssociation","true")
if ($Property_FileTypeAssociation$ = "true")
comment "File Type Association" comment "File Type Association"
DosInAnIcon_FileTypeAssoc_install DosInAnIcon_FileTypeAssoc_install
endif
Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none") Set $Property_CustomPostInstall$ = getProductProperty("custom-post-install","none")
if not ($Property_CustomPostInstall$ = "none") if not ($Property_CustomPostInstall$ = "none")

View File

@ -24,6 +24,8 @@ DefVar $OLD_RELEASE$
DefVar $Reboot$ DefVar $Reboot$
DefVar $Property_FileTypeAssociation$
Set $LogDir$ = "%opsiLogDir%" Set $LogDir$ = "%opsiLogDir%"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh

View File

@ -31,6 +31,8 @@ DefVar $OLD_RELEASE$
DefVar $Reboot$ DefVar $Reboot$
DefVar $Property_FileTypeAssociation$
Set $INST_SystemType$ = GetSystemType Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific") set $INST_architecture$ = GetProductProperty("install_architecture","system specific")

View File

@ -24,6 +24,8 @@ DefVar $OLD_RELEASE$
DefVar $Reboot$ DefVar $Reboot$
DefVar $Property_FileTypeAssociation$
Set $LogDir$ = "%opsiLogDir%" Set $LogDir$ = "%opsiLogDir%"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh

View File

@ -32,7 +32,13 @@ default: ["system specific"]
[ProductProperty] [ProductProperty]
type: bool type: bool
name: desktoplink name: FileTypeAssociation
description: File Type Associations on/off
default: True
[ProductProperty]
type: bool
name: DesktopLink
description: Show Desktop Link on/off description: Show Desktop Link on/off
default: False default: False