From a0fa51575afae9f076b3651d244cf348fed79ad2 Mon Sep 17 00:00:00 2001 From: Dominik Daehn Date: Tue, 15 Oct 2019 11:43:29 +0200 Subject: [PATCH] insert Section LinkFolder_install_DesktopLink_32 and LinkFolder_install_DesktopLink_64 --- CLIENT_DATA/delsub3264.ins | 12 +++---- CLIENT_DATA/setup3264.ins | 65 +++++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 21 deletions(-) diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins index e5c1725..3513f74 100644 --- a/CLIENT_DATA/delsub3264.ins +++ b/CLIENT_DATA/delsub3264.ins @@ -74,12 +74,12 @@ 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 + 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_old_32] diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index 996984e..252c503 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -85,6 +85,10 @@ else Registry_install /32Bit comment "Create shortcuts" LinkFolder_install + Set $Property_DesktopLink$ = GetProductProperty("DesktopLink","false") + if ($Property_DesktopLink$ = "true") + LinkFolder_install_DesktopLink_32 + endif endif if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) @@ -99,23 +103,22 @@ else Registry_install /64Bit comment "Create shortcuts" LinkFolder_install + Set $Property_DesktopLink$ = GetProductProperty("DesktopLink","false") + if ($Property_DesktopLink$ = "true") + LinkFolder_install_DesktopLink_64 + endif + endif + + 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 - Set $Property_DesktopLink$ = GetProductProperty("DesktopLink","false") - if ($Property_DesktopLink$ = "true") - comment "Create shortcuts" - LinkFolder_install - endif - - 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 [Winbatch_install_32] @@ -185,6 +188,38 @@ copy "%ScriptPath%\fdm_uninstall.exe" "$InstallDir64$" ; icon_index: 2 ; end_link +[LinkFolder_install_DesktopLink_32] +; +; Example of creating an shortcut to the installed exe on AllUsers desktop: +; +set_basefolder common_desktopdirectory +set_subfolder "" +; +set_link + name: $NAME$ + target: "$InstallDir32$\fdm.exe" + parameters: + working_dir: $InstallDir32$ + icon_file: + icon_index: +end_link + +[LinkFolder_install_DesktopLink_64] +; +; Example of creating an shortcut to the installed exe on AllUsers desktop: +; +set_basefolder common_desktopdirectory +set_subfolder "" +; +set_link + name: $NAME$ + target: "$InstallDir64$\fdm.exe" + parameters: + working_dir: $InstallDir64$ + icon_file: + icon_index: +end_link + [sub_CustomPostInstall] include_insert "%ScriptPath%\custom\" + $Property_CustomPostInstall$