From 783324306a9c1912eb7a8ec00e22aee7fcc1b4d1 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 13 Mar 2013 22:59:53 +0100 Subject: [PATCH] update to new opsi builder template --- CLIENT_DATA/delsub32.ins | 27 +++++++++--- CLIENT_DATA/login.ins | 24 +++++++++++ CLIENT_DATA/opsi-microsoft.office2007.ini | 6 +++ CLIENT_DATA/setup32.ins | 50 +++++++++++++---------- CLIENT_DATA/uninstall32.ins | 46 ++++++++++----------- OPSI/control | 9 ---- builder-product.cfg | 5 +++ 7 files changed, 107 insertions(+), 60 deletions(-) create mode 100644 CLIENT_DATA/login.ins create mode 100644 CLIENT_DATA/opsi-microsoft.office2007.ini diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 0fc9e8f..9c9d0da 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -1,13 +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$ = '{91120000-00CA-0000-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 @@ -23,14 +36,16 @@ Registry_uninstall /32Bit comment "Delete program shortcuts" LinkFolder_uninstall +[Winbatch_uninstall_msi_old] +"%SystemDrive%\MSOCache\All Users\$MsiIdOld$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall SmallBusinessr + [Winbatch_uninstall_msi] -;msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress "%SystemDrive%\MSOCache\All Users\$MsiId$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall SmallBusinessr [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.office2007.ini b/CLIENT_DATA/opsi-microsoft.office2007.ini new file mode 100644 index 0000000..f92dbda --- /dev/null +++ b/CLIENT_DATA/opsi-microsoft.office2007.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 47da431..34bc688 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -1,12 +1,14 @@ ; 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$ @@ -15,6 +17,9 @@ DefVar $ExitCode$ DefVar $LicenseRequired$ DefVar $LicenseKey$ DefVar $LicensePool$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -34,53 +39,62 @@ 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.office2007" Set $MinimumSpace$ = "1500 MB" ; the path were we find the product after the installation -Set $InstallDir$ = "%ProgramFiles32Dir%\Microsoft Office" +Set $InstallDir$ = "%ProgramFiles32Dir%\Microsoft Office\Office12" Set $LicenseRequired$ = "true" Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- +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$ + " ..." if $LicenseRequired$ = "true" comment "Licensing required, reserve license and get license key" Sub_get_licensekey endif + comment "Remove Install Files" + Winbatch_remove + comment "Extract Office" Winbatch_extract Sub_check_exitcode - + comment "Extract Office Updates" Winbatch_update Sub_check_exitcode - + comment "Create License File" Dosbatch_license Sub_check_exitcode - + comment "Start setup program" Winbatch_install Sub_check_exitcode - + comment "Remove Install Files" Winbatch_remove Sub_check_exitcode + + comment "Start setup program" + ChangeDirectory "%SCRIPTPATH%" + Winbatch_install + Sub_check_exitcode comment "Copy files" Files_install /32Bit @@ -91,15 +105,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_extract] @@ -118,6 +123,9 @@ xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/U delete -sf "$LogDir$\msoffice2007\" [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 58d592a..5f29299 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -1,18 +1,23 @@ ; 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 $LicenseRequired$ DefVar $LicensePool$ +DefVar $OLD_VERSION$ +DefVar $OLD_CREATOR_TAG$ +DefVar $OLD_RELEASE$ Set $LogDir$ = "%SystemDrive%\tmp" @@ -29,15 +34,15 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $ProductId$ = "microosft.office2007" -Set $InstallDir$ = "%ProgramFiles32Dir%\Microsoft Office" +Set $InstallDir$ = "%ProgramFiles32Dir%\Microsoft Office\Office12" Set $LicenseRequired$ = "true" Set $LicensePool$ = "p_" + $ProductId$ ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" comment "Show product picture" -ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ +ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." @@ -52,23 +57,16 @@ if $LicenseRequired$ = "true" endif [Sub_free_license] -if opsiLicenseManagementEnabled - comment "License management is enabled and will be used" - - comment "Trying to free license used for the product" - DefVar $result$ - Set $result$ = FreeLicense($LicensePool$) - ; If there is an assignment of a license pool to the product, it is possible to use - ; Set $result$ = FreeLicense("", $ProductId$) - ; - ; If there is an assignment of a license pool to a windows software id, it is possible to use - ; DefVar $WindowsSoftwareId$ - ; $WindowsSoftwareId$ = "..." - ; set $result$ = FreeLicense("", "", $WindowsSoftwareId$) -else - LogError "Error: licensing required, but license management not enabled" - isFatalError -endif - +comment "License management is enabled and will be used" +comment "Trying to free license used for the product" +DefVar $result$ +Set $result$ = FreeLicense($LicensePool$) +; If there is an assignment of a license pool to the product, it is possible to use +; Set $result$ = FreeLicense("", $ProductId$) +; +; If there is an assignment of a license pool to a windows software id, it is possible to use +; DefVar $WindowsSoftwareId$ +; $WindowsSoftwareId$ = "..." +; set $result$ = FreeLicense("", "", $WindowsSoftwareId$) diff --git a/OPSI/control b/OPSI/control index 57432d3..08f1012 100644 --- a/OPSI/control +++ b/OPSI/control @@ -21,15 +21,6 @@ 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"] - [ProductDependency] action: setup requiredProduct: sourceforge.xmlstarlet diff --git a/builder-product.cfg b/builder-product.cfg index 9f0d24b..f081cf3 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,6 +3,8 @@ ############################ VENDOR="microsoft.com" PN="microsoft.office2007" +NAME="Microsoft Office 2007" +DESCRIPTION="Microsoft Office 2007 ist ein Office-Paket von Microsoft aus der Microsoft-Office-Serie." VERSION="2007.3" RELEASE="3" PRIORITY="0" @@ -27,3 +29,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]="{91120000-00CA-0000-0000-0000000FF1CE}" \ No newline at end of file