update to new opsi builder templates

This commit is contained in:
Mario Fetka 2013-03-14 11:45:48 +01:00
parent e231e7ca3a
commit fcc54c3f15
14 changed files with 164 additions and 61 deletions

View File

@ -1 +0,0 @@
94daff48c6766bd950212c5c3ce9e4c76c92af66 /home/mario/.opsi-dist-cache/microsoft.office2013-2013//1-Office-15-to-Be-Office-2013-Logo-and-Screenshots-Leak.png

View File

@ -1,4 +1,4 @@
<Configuration Product="ProPlus">
<Configuration Product="ProPlusr">
<Display Level="Basic" CompletionNotice="no" SuppressModal="yes" AcceptEula="yes" />

View File

@ -1,16 +1,29 @@
; 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 $MsiId32$ = '{90140000-003D-0000-0000-0000000FF1CE}'
Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini"
Set $MsiId64$ = '{90140000-003D-0000-1000-0000000FF1CE}'
Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini"
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
Message "Uninstalling " + $ProductId$ + " 32 Bit..."
if FileExists($IniFile32$)
Set $OLD_VERSION$ = GetValueFromInifile($IniFile32$,"COMMON","VERSION","")
Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile32$,"COMMON","CREATOR_TAG","")
Set $OLD_RELEASE$ = GetValueFromInifile($IniFile32$,"COMMON","RELEASE","")
endif
Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 32 Bit..."
if FileExists($IniFile32$)
Set $MsiIdOld32$ = GetValueFromInifile($IniFile32$,"X86","MsiId32","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld32$ + "] DisplayName") = "")
comment "Old MSI id " + $MsiIdOld32$ + " found in registry, starting msiexec to uninstall old version"
Winbatch_uninstall_msi_old_32
sub_check_exitcode
endif
endif
if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId32$ + "] DisplayName") = "")
comment "MSI id " + $MsiId32$ + " found in registry, starting msiexec to uninstall"
Winbatch_uninstall_msi_32
@ -24,8 +37,21 @@ if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specif
endif
if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
Message "Uninstalling " + $ProductId$ + " 64 Bit..."
if FileExists($IniFile64$)
Set $OLD_VERSION$ = GetValueFromInifile($IniFile64$,"COMMON","VERSION","")
Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile64$,"COMMON","CREATOR_TAG","")
Set $OLD_RELEASE$ = GetValueFromInifile($IniFile64$,"COMMON","RELEASE","")
endif
Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " 64 Bit..."
if FileExists($IniFile64$)
Set $MsiIdOld64$ = GetValueFromInifile($IniFile64$,"X86_64","MsiId64","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}")
if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld64$ + "] DisplayName") = "")
comment "Old MSI id " + $MsiIdOld64$ + " found in registry, starting msiexec to uninstall old version"
Winbatch_uninstall_msi_old_64
sub_check_exitcode
endif
endif
if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId64$ + "] DisplayName") = "")
comment "MSI id " + $MsiId64$ + " found in registry, starting msiexec to uninstall"
Winbatch_uninstall_msi_64
@ -41,23 +67,27 @@ endif
comment "Delete program shortcuts"
LinkFolder_uninstall
[Winbatch_uninstall_msi_old_32]
"%SystemDrive%\MSOCache\All Users\$MsiIdOld32$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall ProPlusr
[Winbatch_uninstall_msi_32]
;msiexec /x $MsiId32$ /qb! REBOOT=ReallySuppress
"%SystemDrive%\MSOCache\All Users\$MsiId32$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall SingleImage
"%SystemDrive%\MSOCache\All Users\$MsiId32$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall ProPlusr
[Files_uninstall_32]
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
;
; delete -sf "$InstallDir32$\"
[Winbatch_uninstall_msi_old_64]
"%SystemDrive%\MSOCache\All Users\$MsiIdOld64$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall ProPlusr
[Winbatch_uninstall_msi_64]
;msiexec /x $MsiId64$ /qb! REBOOT=ReallySuppress
"%SystemDrive%\MSOCache\All Users\$MsiId64$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall SingleImage
"%SystemDrive%\MSOCache\All Users\$MsiId64$-C\setup.exe" /config %ScriptPath%\config.xml /uninstall ProPlusr
[Files_uninstall_64]
; Example for recursively deleting the installation directory (don't forget the trailing backslash):
; Example for recursively deleting the installation directory:
;
; delete -sf "$InstallDir64$\"
; del -sf "$InstallDir64$\"
[Registry_uninstall]
; Example of deleting a registry key:

24
CLIENT_DATA/login.ins Normal file
View File

@ -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"

View File

@ -0,0 +1,9 @@
[X86]
MsiId32={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
[X86_64]
MsiId64={XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}
[COMMON]
PN=name
VERSION=version

View File

@ -1,13 +1,16 @@
; 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 $MsiId32$
DefVar $MsiId64$
DefVar $MsiIdOld32$
DefVar $IniFile32$
DefVar $MsiIdOld64$
DefVar $IniFile64$
DefVar $IniCfgFile$
DefVar $LogDir$
DefVar $ProductId$
DefVar $MinimumSpace$
@ -19,11 +22,13 @@ DefVar $LicenseKey$
DefVar $LicensePool$
DefVar $INST_SystemType$
DefVar $INST_architecture$
DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$
Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
Set $LogDir$ = "%SystemDrive%\tmp"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@ -42,22 +47,23 @@ 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.office2013"
Set $MinimumSpace$ = "1500 MB"
; the path were we find the product after the installation
Set $InstallDir32$ = "%ProgramFiles32Dir%\Microsoft Office"
Set $InstallDir64$ = "%ProgramFiles64Dir%\Microsoft Office"
Set $InstallDir32$ = "%ProgramFiles32Dir%\Microsoft Office\Office15"
Set $InstallDir64$ = "%ProgramFiles64Dir%\Microsoft Office\Office15"
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
; 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%\delsub3264.ins")
comment "Start uninstall sub section"
@ -72,19 +78,20 @@ else
comment "installing"
if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only")
Message "Installing " + $ProductId$ + " 32 Bit..."
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%"
comment "Remove Install Files"
Winbatch_remove_32
Sub_check_exitcode
comment "Extract Office"
Winbatch_extract_32
Dosbatch_extract_32
Sub_check_exitcode
; comment "Extract Office Updates"
; Winbatch_update_32
; Sub_check_exitcode
;comment "Extract Office Updates"
;Winbatch_update_32
;Sub_check_exitcode
comment "Create License File"
Dosbatch_license_32
@ -107,19 +114,20 @@ else
endif
if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only"))
Message "Installing " + $ProductId$ + " 64 Bit..."
Message "Installing " + $ProductId$ + " " + $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%"
comment "Remove Install Files"
Winbatch_remove_64
Sub_check_exitcode
comment "Extract Office"
Winbatch_extract_64
Dosbatch_extract_64
Sub_check_exitcode
; comment "Extract Office Updates"
; Winbatch_update_64
; Sub_check_exitcode
;comment "Extract Office Updates"
;Winbatch_update_64
;Sub_check_exitcode
comment "Create License File"
Dosbatch_license_64
@ -143,11 +151,12 @@ else
endif
[Winbatch_extract_32]
$Install32Exe$ /quiet /extract:$LogDir$\msoffice2013-32
[Dosbatch_extract_32]
;$Install32Exe$ /quiet /extract:$LogDir$\msoffice2013-32
vcopy -v %ScriptPath%\X86 $LogDir$\msoffice2013-32
[Winbatch_update_32]
$Install32Sp1Exe$ /quiet /extract:$LogDir$\msoffice2013-32\Updates
;[Winbatch_update_32]
;$Install32Sp1Exe$ /quiet /extract:$LogDir$\msoffice2013-32\Updates
[Dosbatch_license_32]
xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/USERNAME/@Value" -v %HostID% -u "/Configuration/COMPANYNAME/@Value" -v %HostID% -u "/Configuration/INSTALLLOCATION/@Value" -v "$InstallDir32$" %ScriptPath%\config.xml > $LogDir$\msoffice2013-32.xml
@ -159,15 +168,19 @@ xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/U
delete -sf "$LogDir$\msoffice2013-32\"
[Files_install_32]
; copy the ini file to the InstallDir
copy "$IniCfgFile$" "$InstallDir32$"
; Example of recursively copying some files into the installation directory:
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$"
[Winbatch_extract_64]
$Install64Exe$ /quiet /extract:$LogDir$\msoffice2013-64
[Dosbatch_extract_64]
; $Install64Exe$ /quiet /extract:$LogDir$\msoffice2013-64
vcopy -v %ScriptPath%\X86_64 $LogDir$\msoffice2013-64
[Winbatch_update_64]
$Install64Sp1Exe$ /quiet /extract:$LogDir$\msoffice2013-64\Updates
;[Winbatch_update_64]
;$Install64Sp1Exe$ /quiet /extract:$LogDir$\msoffice2013-64\Updates
[Dosbatch_license_64]
xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/USERNAME/@Value" -v %HostID% -u "/Configuration/COMPANYNAME/@Value" -v %HostID% -u "/Configuration/INSTALLLOCATION/@Value" -v "$InstallDir64$" %ScriptPath%\config.xml > $LogDir$\msoffice2013-64.xml
@ -179,6 +192,9 @@ xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/U
delete -sf "$LogDir$\msoffice2013-64\"
[Files_install_64]
; copy the ini file to the InstallDir
copy "$IniCfgFile$" "$InstallDir64$"
; Example of recursively copying some files into the installation directory:
;
; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$"

View File

@ -1,13 +1,16 @@
; 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 $MsiId32$
DefVar $MsiId64$
DefVar $MsiIdOld32$
DefVar $IniFile32$
DefVar $MsiIdOld64$
DefVar $IniFile64$
DefVar $IniCfgFile$
DefVar $LogDir$
DefVar $ExitCode$
DefVar $ProductId$
@ -17,11 +20,13 @@ DefVar $LicenseRequired$
DefVar $LicensePool$
DefVar $INST_SystemType$
DefVar $INST_architecture$
DefVar $OLD_VERSION$
DefVar $OLD_CREATOR_TAG$
DefVar $OLD_RELEASE$
Set $INST_SystemType$ = GetSystemType
set $INST_architecture$ = GetProductProperty("install_architecture","system specific")
Set $LogDir$ = "%SystemDrive%\tmp"
; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh
@ -37,16 +42,16 @@ Set $LogDir$ = "%SystemDrive%\tmp"
; ----------------------------------------------------------------
; - Please edit the following values -
; ----------------------------------------------------------------
Set $ProductId$ = "microsoft.office2013"
Set $InstallDir32$ = "%ProgramFiles32Dir%\Microsoft Office"
Set $InstallDir64$ = "%ProgramFiles64Dir%\Microsoft Office"
Set $InstallDir32$ = "%ProgramFiles32Dir%\Microsoft Office\Office15"
Set $InstallDir64$ = "%ProgramFiles64Dir%\Microsoft Office\Office15"
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$ + " ..."

View File

@ -35,3 +35,10 @@ action: setup
requiredProduct: sourceforge.xmlstarlet
requiredStatus: installed
requirementType: before
[ProductDependency]
action: setup
requiredProduct: kliu.vcopy
requiredStatus: installed
requirementType: before

View File

@ -0,0 +1 @@
3e15e47305b21e7eea0415f1054341ba8b6634cf /home/mario/.opsi-dist-cache/microsoft.office2013-2013/X86_64/OfficeProfessionalPlus_x64_de-de.img

View File

@ -0,0 +1 @@
ba09c19606663b5874a22c3c102191dee40e4607 /home/mario/.opsi-dist-cache/microsoft.office2013-2013/X86/OfficeProfessionalPlus_x86_de-de.img

View File

@ -3,6 +3,8 @@
############################
VENDOR="microsoft.com"
PN="microsoft.office2013"
NAME="Microsoft Office 2013"
DESCRIPTION="Microsoft Office 2013 ist ein Office-Paket von Microsoft aus der Microsoft-Office-Serie."
VERSION="2013"
RELEASE="3"
PRIORITY="0"
@ -12,18 +14,18 @@ ADVICE=""
# Valid value: restricted | public
TYPE="restricted"
DL_FILE[0]="1-Office-15-to-Be-Office-2013-Logo-and-Screenshots-Leak.png"
DL_SOURCE[0]="http://1.bp.blogspot.com/-WKM8i33qvK8/T9fmDXjJakI/AAAAAAAAL38/hfNBp9x4ZdE/s320/1-Office-15-to-Be-Office-2013-Logo-and-Screenshots-Leak.png"
DL_FILE[0]="office_blog.jpg"
DL_SOURCE[0]="http://blog.video2brain.com/de/files/2013/02/office_blog.jpg"
DL_FILE[1]="professionalplus_en-us_x86.exe"
DL_SOURCE[1]="http://care.dlservice.microsoft.com/download/4/7/1/4712B4E1-4DD9-4468-B8A4-507D7F988B1F/professionalplus_en-us_x86.exe"
DL_FILE[1]="OfficeProfessionalPlus_x86_de-de.img"
DL_SOURCE[1]="http://care.dlservice.microsoft.com//dl/download/4/5/8/458D7E64-E7E3-4563-8DED-3DBEFEDAF981/OfficeProfessionalPlus_x86_de-de.img?lcid=1031"
DL_ARCH[1]="X86"
DL_WINST_NAME[1]=Install32Exe
DL_EXTRACT_FORMAT[1]="7zip"
DL_FILE[2]="professionalplus_en-us_x64.exe"
DL_SOURCE[2]="http://care.dlservice.microsoft.com/download/4/7/1/4712B4E1-4DD9-4468-B8A4-507D7F988B1F/professionalplus_en-us_x64.exe"
DL_FILE[2]="OfficeProfessionalPlus_x64_de-de.img"
DL_SOURCE[2]="http://care.dlservice.microsoft.com//dl/download/4/5/8/458D7E64-E7E3-4563-8DED-3DBEFEDAF981/OfficeProfessionalPlus_x64_de-de.img?lcid=1031"
DL_ARCH[2]="X86_64"
DL_WINST_NAME[2]=Install64Exe
DL_EXTRACT_FORMAT[2]="7zip"
#DL_FILE[3]="officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe"
#DL_SOURCE[3]="http://download.microsoft.com/download/4/3/D/43DB7693-6B64-4DB7-B137-D10E8DA4929B/officesuite2010sp1-kb2460049-x86-fullfile-de-de.exe"
@ -35,6 +37,16 @@ DL_WINST_NAME[2]=Install64Exe
#DL_ARCH[4]="X86_64"
#DL_WINST_NAME[4]=Install64Sp1Exe
#WINST_NAME[1]=Install32Exe
#WINST_NAME[2]=Install64Exe
# File array index for the image showing while installing the program
ICON_DL_INDEX=0
OPSI_INI_SECTION[0]="X86"
OPSI_INI_OPTION[0]="MsiId32"
OPSI_INI_VALUE[0]="{90140000-003D-0000-0000-0000000FF1CE}"
OPSI_INI_SECTION[1]="X86_64"
OPSI_INI_OPTION[1]="MsiId64"
OPSI_INI_VALUE[1]="{90140000-003D-0000-1000-0000000FF1CE}"

1
office_blog.jpg.sha1sum Normal file
View File

@ -0,0 +1 @@
22378d73f23bd3fed601cb14d91ab611da26525a /home/mario/.opsi-dist-cache/microsoft.office2013-2013//office_blog.jpg

View File

@ -1 +0,0 @@
c802d1067cf2230b01241638433a6e10a5953b8f /home/mario/.opsi-dist-cache/microsoft.office2013-2013/X86_64/professionalplus_en-us_x64.exe

View File

@ -1 +0,0 @@
ba4d28bd03f777a1caaa662751d1b23085ada527 /home/mario/.opsi-dist-cache/microsoft.office2013-2013/X86/professionalplus_en-us_x86.exe