From 3a7c896ca765c8ea321a0e03a6ce99fecbd4bd2d Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Wed, 13 Mar 2013 22:32:00 +0100
Subject: [PATCH] update to new opsi builder template
---
CLIENT_DATA/delsub32.ins | 27 ++++++++++----
CLIENT_DATA/login.ins | 24 +++++++++++++
CLIENT_DATA/opsi-microsoft.excelviewer.ini | 6 ++++
CLIENT_DATA/setup32.ins | 42 +++++++++++++---------
CLIENT_DATA/uninstall32.ins | 23 +++++++++---
OPSI/control | 8 -----
builder-product.cfg | 3 ++
7 files changed, 97 insertions(+), 36 deletions(-)
create mode 100644 CLIENT_DATA/login.ins
create mode 100644 CLIENT_DATA/opsi-microsoft.excelviewer.ini
diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index af1eb69..6f1e92a 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -1,14 +1,26 @@
; Copyright (c) uib gmbh (www.uib.de)
; This sourcecode is owned by uib gmbh
; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
-;Set $MsiId$ = '{00004159-FA00-7040-0000-000000F01FEC}'
-Set $MsiId$ = '{95120000-003F-0407-0000-0000000FF1CE}'
+Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini"
-Message "Uninstalling " + $ProductId$ + " ..."
+if FileExists($IniFile$)
+ Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","")
+ Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","")
+ Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","")
+endif
+Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."
+if FileExists($IniFile$)
+ Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
+ if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "")
+ comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version"
+ Winbatch_uninstall_msi_old
+ sub_check_exitcode
+ endif
+endif
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "")
comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall"
Winbatch_uninstall_msi
@@ -24,13 +36,16 @@ Registry_uninstall /32Bit
comment "Delete program shortcuts"
LinkFolder_uninstall
+[Winbatch_uninstall_msi_old]
+msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress
+
[Winbatch_uninstall_msi]
msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
[Files_uninstall]
-; Example for recursively deleting the installation directory (don't forget the trailing backslash):
+; Example for recursively deleting the installation directory:
;
-; delete -sf "$InstallDir$\"
+del -sf "$InstallDir$\"
[Registry_uninstall]
; Example of deleting a registry key:
diff --git a/CLIENT_DATA/login.ins b/CLIENT_DATA/login.ins
new file mode 100644
index 0000000..7b85744
--- /dev/null
+++ b/CLIENT_DATA/login.ins
@@ -0,0 +1,24 @@
+; Copyright (c) uib gmbh (www.uib.de)
+; This sourcecode is owned by uib gmbh
+; and published under the Terms of the General Public License.
+; credits: http://www.opsi.org/en/credits/
+
+[Actions]
+Message "Profile Patch for VLC ...."
+
+comment "Did we run this script before ? - and set version stamp in profile"
+if getValue("installationstate", getProductMap) = "installed"
+ comment "Product is installed"
+ if not (scriptWasExecutedBefore)
+ comment "loginscript was not run yet "
+ Files_profile_copy
+ Registry_currentuser_set
+ endif
+endif
+
+[Files_profile_copy]
+copy "%Scriptpath%\profiles\*.*" "%CurrentAppdataDir%\ACME"
+
+[Registry_currentuser_set]
+openkey [HKCU\Software\ACME]
+set "show_greeting_window" = "no"
diff --git a/CLIENT_DATA/opsi-microsoft.excelviewer.ini b/CLIENT_DATA/opsi-microsoft.excelviewer.ini
new file mode 100644
index 0000000..f92dbda
--- /dev/null
+++ b/CLIENT_DATA/opsi-microsoft.excelviewer.ini
@@ -0,0 +1,6 @@
+[X86]
+MsiId={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
+
+[COMMON]
+PN=name
+VERSION=version
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 645c7de..e043a15 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -1,21 +1,33 @@
; Copyright (c) uib gmbh (www.uib.de)
; This sourcecode is owned by uib
; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
[Actions]
-requiredWinstVersion >= "4.10.8.6"
+requiredWinstVersion >= "4.11.2.6"
-DefVar $MsiId$
+DefVar $MsiIdOld$
+DefVar $IniFile$
+DefVar $IniCfgFile$
DefVar $LogDir$
DefVar $ProductId$
DefVar $MinimumSpace$
DefVar $InstallDir$
DefVar $ExitCode$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
Set $LogDir$ = "%SystemDrive%\tmp"
-; Token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+; and adds the following variables:
+; from builder-product.cfg : all variables definded by attribute WINST[index]
+; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE
+; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL
+; auto generated winst-variables
+; $IconFile$: path to product picture
+;
@@BUILDER_VARIABLES@@
; ----------------------------------------------------------------
@@ -24,28 +36,30 @@ Set $LogDir$ = "%SystemDrive%\tmp"
;$ProductId$ should be the name of the product in opsi
; therefore please: only lower letters, no umlauts,
; no white space use '-' as a seperator
-Set $ProductId$ = "microsoft.excelviewer"
Set $MinimumSpace$ = "150 MB"
; the path were we find the product after the installation
Set $InstallDir$ = "%ProgramFiles32Dir%\Microsoft Office\Office12"
; ----------------------------------------------------------------
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
+
if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$))
LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$
- isFatalError
+ isFatalError "No Space"
; Stop process and set installation status to failed
else
comment "Show product picture"
- ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
if FileExists("%ScriptPath%\delsub32.ins")
comment "Start uninstall sub section"
Sub "%ScriptPath%\delsub32.ins"
endif
- Message "Installing " + $ProductId$ + " ..."
+ Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..."
comment "Start setup program"
+ ChangeDirectory "%SCRIPTPATH%"
Winbatch_install
Sub_check_exitcode
@@ -58,15 +72,6 @@ else
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
-
endif
[Winbatch_install]
@@ -74,6 +79,9 @@ endif
"$InstallSp3Exe$" /quiet /passive /norestart
[Files_install]
+; copy the ini file to the InstallDir
+copy "$IniCfgFile$" "$InstallDir$"
+
; Example of recursively copying some files into the installation directory:
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins
index b7b8ee0..efb4341 100644
--- a/CLIENT_DATA/uninstall32.ins
+++ b/CLIENT_DATA/uninstall32.ins
@@ -1,31 +1,44 @@
; Copyright (c) uib gmbh (www.uib.de)
; This sourcecode is owned by uib gmbh
; and published under the Terms of the General Public License.
-; credits: http://www.opsi.org/credits/
+; credits: http://www.opsi.org/en/credits/
[Actions]
-requiredWinstVersion >= "4.10.8.6"
+requiredWinstVersion >= "4.11.2.6"
-DefVar $MsiId$
+DefVar $MsiIdOld$
+DefVar $IniFile$
+DefVar $IniCfgFile$
DefVar $LogDir$
DefVar $ExitCode$
DefVar $ProductId$
DefVar $InstallDir$
+DefVar $OLD_VERSION$
+DefVar $OLD_CREATOR_TAG$
+DefVar $OLD_RELEASE$
Set $LogDir$ = "%SystemDrive%\tmp"
+; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
+; and adds the following variables:
+; from builder-product.cfg : all variables definded by attribute WINST[index]
+; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE
+; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL
+; auto generated winst-variables
+; $IconFile$: path to product picture
+;
@@BUILDER_VARIABLES@@
; ----------------------------------------------------------------
; - Please edit the following values -
; ----------------------------------------------------------------
-Set $ProductId$ = "microsoft.excelviewer"
Set $InstallDir$ = "%ProgramFiles32Dir%\Microsoft Office\Office12"
; ----------------------------------------------------------------
+Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini"
comment "Show product picture"
-ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$
+ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$
Message "Uninstalling " + $ProductId$ + " ..."
diff --git a/OPSI/control b/OPSI/control
index 040b633..a80a01e 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -21,11 +21,3 @@ onceScript:
customScript:
userLoginScript:
-[ProductProperty]
-type: unicode
-name: install_architecture
-multivalue: False
-editable: False
-description: which architecture (32/64 bit) has to be installed
-values: ["32 only", "64 only", "both", "system specific"]
-default: ["system specific"]
diff --git a/builder-product.cfg b/builder-product.cfg
index 4fda72a..572d1c7 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -33,3 +33,6 @@ DL_WINST_NAME[2]="InstallSp3Exe"
# File array index for the image showing while installing the program
ICON_DL_INDEX=0
+OPSI_INI_SECTION[0]="X86"
+OPSI_INI_OPTION[0]="MsiId"
+OPSI_INI_VALUE[0]="{95120000-003F-0407-0000-0000000FF1CE}"
\ No newline at end of file