cleaned

CLIENT_DATA/custom/custom.cfg

@@ -0,0 +1,16 @@
+[Configuration]
+Policy = Standard
+DefaultPolicyPath = C:\Programme\itWatch
+ReplicationType = DIR
+Replication = LOGON
+RepCycle = 2
+SERVER = .
+PolicyDir = \\winservice2.dtnet.de\itwatch_policies
+PolicyRepository = winservice2.dtnet.de
+LogLevel = Error
+DEvConService = ON
+DEvConServer = winservice2.dtnet.de
+DEvConBuffer = 1000
+DEvConUserID = ON
+EFXEnabled = OFF
+KMSService = OFF

CLIENT_DATA/setup32.ins

@@ -13,9 +13,12 @@ DefVar $ProductId$
 DefVar $MinimumSpace$
 DefVar $InstallDir$
 DefVar $ExitCode$
-DefVar $LicenseRequired$
+DefVar $INST_SystemType$
-DefVar $LicenseKey$
+DefVar $INST_architecture$
-DefVar $LicensePool$
+
+Set $INST_SystemType$ = GetSystemType
+Set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
+
 
 ; Token BUILDER_VARIABLES will be replace by builder.sh
 @@BUILDER_VARIABLES@@
@@ -32,8 +35,6 @@ Set $ProductId$       = "itwess"
 Set $MinimumSpace$    = "10 MB"
 ; the path were we find the product after the installation
 Set $InstallDir$      = "%ProgramFiles32Dir%\itWatch"
-Set $LicenseRequired$ = "false"
-Set $LicensePool$     = "p_" + $ProductId$
 ; ----------------------------------------------------------------
 
 if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
@@ -51,133 +52,29 @@ else
 	endif
 	
 	Message "Installing " + $ProductId$ + " ..."
-	
+		
-	if $LicenseRequired$ = "true"
+	if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
-		comment "Licensing required, reserve license and get license key"
+		comment "Start setup program"
-		Sub_get_licensekey
+		Winbatch_install_64
+		Sub_check_exitcode
 	endif
-	
+
 	comment "Start setup program"
-	Winbatch_install
+	Winbatch_install_32
 	Sub_check_exitcode
-	
-	comment "Copy files"
-	Files_install /32Bit
-	
-	comment "Patch Registry"
-	Registry_install /32Bit
-	
-	comment "Create shortcuts"
-	LinkFolder_install
-	
-	comment "Test for installation success"
-	; Test if software marked as installed in registry
-	; if (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] DisplayName") = "")
-	; 	logError "Fatal: After Installation 32 bit [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}] not found"
-	; 	isFatalError
-	; else
-	; 	comment "Successful Installation"
-	; endif
 
 	comment "Trigger reboot"
-        ExitWindows /Reboot
+       ExitWindows /Reboot
 
 endif
 
-[Winbatch_install]
+[Winbatch_install_64]
-; Choose one of the following examples as basis for your installation
+msiexec /i "$Msi64$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress CONFIGURATIONPATH="%ScriptPath%\custom\custom.cfg"
-; You can use $LicenseKey$ var to pass a license key to the installer
+
-;
+[Winbatch_install_32]
-; === MSI package =======================================================================================
-; You may use the parameter PIDKEY=$Licensekey$
 msiexec /i "$Msi32$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress CONFIGURATIONPATH="%ScriptPath%\custom\custom.cfg"
 
 
-[Files_install]
-; Example of recursively copying some files into the installation directory:
-;
-; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
-
-[Registry_install]
-; Example of setting some values of an registry key:
-;
-; openkey [HKEY_LOCAL_MACHINE\Software\$ProductId$]
-; set "name1" = "some string value"
-; set "name2" = REG_DWORD:0001
-; set "name3" = REG_BINARY:00 af 99 cd
-
-[LinkFolder_install]
-; 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: <path to the program>
-; 	parameters:
-; 	working_dir: $InstallDir$
-; 	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: <path to the program>
-; 	parameters: <some_param>
-; 	working_dir: $InstallDir$
-; 	icon_file: <path to icon file>
-; 	icon_index: 2
-; end_link
-
-[Sub_get_licensekey]
-if opsiLicenseManagementEnabled
-	comment "License management is enabled and will be used"
-
-	comment "Trying to get a license key"
-	Set $LicenseKey$ = demandLicenseKey ($LicensePool$)
-	; If there is an assignment of exactly one licensepool to the product the following call is possible:
-	; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$)
-	;
-	; If there is an assignment of a license pool to a windows software id, it is possible to use:
-	; DefVar $WindowsSoftwareId$
-	; $WindowsSoftwareId$ = "..."
-	; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$)
-	
-	DefVar $ServiceErrorClass$
-	set $ServiceErrorClass$ = getLastServiceErrorClass
-	comment "Error class: " + $ServiceErrorClass$
-	
-	if $ServiceErrorClass$ = "None"
-		comment "Everything fine, we got the license key '" + $LicenseKey$ + "'"
-	else
-		if $ServiceErrorClass$ = "LicenseConfigurationError"
-			LogError "Fatal: license configuration must be corrected"
-			LogError getLastServiceErrorMessage
-			isFatalError
-		else 
-			if $ServiceErrorClass$ = "LicenseMissingError"
-				LogError "Fatal: required license is not supplied"
-				isFatalError
-			endif
-		endif
-	endif
-else
-	LogError "Fatal: license required, but license management not enabled"
-	isFatalError
-endif
-
-
 [Sub_check_exitcode]
 comment "Test for installation success via exit code"
 set $ExitCode$ = getLastExitCode

builder-product.cfg

@@ -19,12 +19,13 @@ DL_FILE[0]="267005.jpg"
 DL_SOURCE[0]="http://www.pressebox.de/pr-images/267005.jpg"
 
 DL_FILE[1]="itWESS-Client_German.msi"
-DL_SOURCE[1]="http://internal.graz.disconnected-by-peer.at/Orig/itWatch/itWESS/HB/4.10.37/itWESS-Client_German.msi"
+DL_SOURCE[1]="http://ivyrepos.dtnet.de/itwatch/itwatch/4.10.19/itWESS-Client_German.msi"
+#"http://internal.graz.disconnected-by-peer.at/Orig/itWatch/itWESS/HB/4.10.37/itWESS-Client_German.msi"
 DL_ARCH[1]="X86"
 DL_WINST_NAME[1]=Msi32
 
-#DL_FILE[2]="itWESS-64bit_German.msi"
+DL_FILE[2]="itWESS-64bit_German.msi"
-#DL_SOURCE[2]="http://ivyrepos.dtnet.de/itwatch/itwatch/4.10.19/itWESS-64bit_German.msi;http://internal.graz.disconnected-by-peer.at/Orig/itWatch/itWESS/HB/4.10.19/itWESS-64bit_German.msi"
+DL_SOURCE[2]="http://ivyrepos.dtnet.de/itwatch/itwatch/4.10.19/itWESS-64bit_German.msi"
-#DL_ARCH[2]="X86_64"
+DL_ARCH[2]="X64"
-#DL_WINST_NAME[2]=itWESS64
+DL_WINST_NAME[2]=Msi64
 

itWESS-64bit_German.msi.sha1sum

@@ -0,0 +1 @@
+1dff5ec593ff0dfa493e279ca5fc140bf110dc47  /home/dtrinks/.opsi-dist-cache/itwatch.de/itwatch.itwess/4.10.37/X64/itWESS-64bit_German.msi