From cb8289d5dd607043dcbe0c2773feb375655fb51a Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Fri, 20 Sep 2019 12:41:25 +0200
Subject: [PATCH] add more doc to builder-product.cfg

---
 sample/All/CLIENT_DATA/setup32.opsiscript   |  4 +-
 sample/All/CLIENT_DATA/setup3264.opsiscript | 48 ++++++++++++++++++---
 sample/All/builder-product.cfg              | 28 ++++++++++--
 3 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/sample/All/CLIENT_DATA/setup32.opsiscript b/sample/All/CLIENT_DATA/setup32.opsiscript
index 7de54a0..e05612d 100644
--- a/sample/All/CLIENT_DATA/setup32.opsiscript
+++ b/sample/All/CLIENT_DATA/setup32.opsiscript
@@ -145,7 +145,7 @@ copy "$IniCfgFile$" "$InstallDir$"
 ;
 ; set_link
 ; 	name: $ProductId$
-; 	target: <path to the program>
+; 	target: $InstallDir$\$ProgramExecutable$
 ; 	parameters:
 ; 	working_dir: $InstallDir$
 ; 	icon_file:
@@ -159,7 +159,7 @@ copy "$IniCfgFile$" "$InstallDir$"
 ;
 ; set_link
 ; 	name: $ProductId$
-; 	target: <path to the program>
+; 	target: $InstallDir$\$ProgramExecutable$
 ; 	parameters: <some_param>
 ; 	working_dir: $InstallDir$
 ; 	icon_file: <path to icon file>
diff --git a/sample/All/CLIENT_DATA/setup3264.opsiscript b/sample/All/CLIENT_DATA/setup3264.opsiscript
index bedb7d6..c0e9833 100644
--- a/sample/All/CLIENT_DATA/setup3264.opsiscript
+++ b/sample/All/CLIENT_DATA/setup3264.opsiscript
@@ -92,7 +92,7 @@ else
 		comment "Patch Registry"
 		Registry_install /32Bit
 		comment "Create shortcuts"
-		LinkFolder_install
+		LinkFolder_install_32
 		comment "File Type Association"
 		FileTypeAssoc_install
 	endif
@@ -108,7 +108,7 @@ else
 		comment "Patch Registry"
 		Registry_install /64Bit
 		comment "Create shortcuts"
-		LinkFolder_install
+		LinkFolder_install_64
 		comment "File Type Association"
 		FileTypeAssoc_install
 	endif
@@ -193,7 +193,7 @@ copy "$IniCfgFile$" "$InstallDir64$"
 ; set "name2" = REG_DWORD:0001
 ; set "name3" = REG_BINARY:00 af 99 cd
 
-[LinkFolder_install]
+[LinkFolder_install_32]
 ; Example of deleting a folder from AllUsers startmenu:
 ;
 ; set_basefolder common_programs
@@ -206,9 +206,9 @@ copy "$IniCfgFile$" "$InstallDir64$"
 ;
 ; set_link
 ; 	name: $ProductId$
-; 	target: <path to the program>
+; 	target: $InstallDir32$\$ProgramExecutable32$
 ; 	parameters:
-; 	working_dir: $InstallDir$
+; 	working_dir: $InstallDir32$
 ; 	icon_file:
 ; 	icon_index:
 ; end_link
@@ -220,9 +220,43 @@ copy "$IniCfgFile$" "$InstallDir64$"
 ;
 ; set_link
 ; 	name: $ProductId$
-; 	target: <path to the program>
+; 	target: $InstallDir32$\$ProgramExecutable32$
 ; 	parameters: <some_param>
-; 	working_dir: $InstallDir$
+; 	working_dir: $InstallDir32$
+; 	icon_file: <path to icon file>
+; 	icon_index: 2
+; end_link
+
+[LinkFolder_install_64]
+; Example of deleting a folder from AllUsers startmenu:
+;
+; set_basefolder common_programs
+; delete_subfolder $ProductId$
+;
+; Example of creating an shortcut to the installed exe in AllUsers startmenu:
+;
+; set_basefolder common_programs
+; set_subfolder $ProductId$
+;
+; set_link
+; 	name: $ProductId$
+; 	target: $InstallDir64$\$ProgramExecutable64$
+; 	parameters:
+; 	working_dir: $InstallDir64$
+; 	icon_file:
+; 	icon_index:
+; end_link
+;
+; Example of creating an shortcut to the installed exe on AllUsers desktop:
+;
+; set_basefolder common_desktopdirectory
+; set_subfolder ""
+;
+; set_link
+; 	name: $ProductId$
+; 	target: $InstallDir64$\$ProgramExecutable64$
+; 	parameters: <some_param>
+; 	working_dir: $InstallDir64$
 ; 	icon_file: <path to icon file>
 ; 	icon_index: 2
 ; end_link
diff --git a/sample/All/builder-product.cfg b/sample/All/builder-product.cfg
index f119795..c28c27f 100644
--- a/sample/All/builder-product.cfg
+++ b/sample/All/builder-product.cfg
@@ -98,6 +98,26 @@ DL_EXTRACT_TO[3]="office"
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
 
+#######################################
+# specify Executable for Desktop link
+#######################################
+
+on 32bit or 64bit packages 
+WINST_NAME[0]="ProgramExecutable"
+WINST_VALUE[0]="7z.exe"
+
+######################################
+
+on the dual arch package 
+WINST_NAME[0]="ProgramExecutable32"
+WINST_VALUE[0]="7z.exe"
+
+# AND
+
+WINST_NAME[0]="ProgramExecutable64"
+WINST_VALUE[0]="7z.exe"
+
+
 #########################
 # Setup additional, custom WINST variables 
 # which will be injected to the *.ins files (replaces token @@BUILDER_VARIABLES@@ )
@@ -110,11 +130,11 @@ ICON_DL_INDEX=0
 #        results in "%ScriptPath%\X86_64\svcpack\aio-runtimes.exe"
 #
 #########################
-WINST_NAME[0]="InstallExe"
-WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[2]@\\svcpack\\aio-runtimes.exe"
+WINST_NAME[1]="InstallExe"
+WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\svcpack\\aio-runtimes.exe"
 
-WINST_NAME[1]="MyVar"
-WINST_VALUE[1]="My content"
+WINST_NAME[2]="MyVar"
+WINST_VALUE[3]="My content"
 
 #########################
 # Setup required OPSI_INI variables