commit 3b8abb5d7c540a8f9271e0ed635cf54ec6c819d7 Author: Mario Fetka Date: Tue Feb 7 18:19:07 2012 +0100 add xlviewer diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins new file mode 100644 index 0000000..e71ec7b --- /dev/null +++ b/CLIENT_DATA/delsub32.ins @@ -0,0 +1,96 @@ +; 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/ + + +;Set $MsiId$ = '{00004159-FA00-7040-0000-000000F01FEC}' +Set $MsiId$ = '{95120000-003F-0409-0000-0000000FF1CE}' +Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" + +Message "Uninstalling " + $ProductId$ + " ..." + +if FileExists($UninstallProgram$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall + sub_check_exitcode +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 + sub_check_exitcode +endif + +comment "Delete files" +Files_uninstall /32Bit + +comment "Cleanup registry" +Registry_uninstall /32Bit + +comment "Delete program shortcuts" +LinkFolder_uninstall + +[Winbatch_uninstall] +; Choose one of the following examples as basis for program uninstall +; +; === Nullsoft Scriptable Install System ================================================================ +; "$UninstallProgram$" /S +; +; === Inno Setup ======================================================================================== +; "$UninstallProgram$" /silent /norestart + + +[Winbatch_uninstall_msi] +msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress + +[Files_uninstall] +; Example for recursively deleting the installation directory (don't forget the trailing backslash): +; +; delete -sf "$InstallDir$\" + +[Registry_uninstall] +; Example of deleting a registry key: +; +; deletekey [HKEY_LOCAL_MACHINE\Software\$ProductId$] + +[LinkFolder_uninstall] +; Example of deleting a folder from AllUsers startmenu: +; +; set_basefolder common_programs +; delete_subfolder $ProductId$ +; +; Example of deleting a shortcut from AllUsers desktop: +; +; set_basefolder common_desktopdirectory +; set_subfolder "" +; delete_element $ProductId$ + +[Sub_check_exitcode] +comment "Test for installation success via exit code" +set $ExitCode$ = getLastExitCode +; informations to exit codes see +; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx +; http://msdn.microsoft.com/en-us/library/aa368542.aspx +if ($ExitCode$ = "0") + comment "Looks good: setup program gives exitcode zero" +else + comment "Setup program gives a exitcode unequal zero: " + $ExitCode$ + if ($ExitCode$ = "1605") + comment "ERROR_UNKNOWN_PRODUCT 1605 This action is only valid for products that are currently installed." + comment "Uninstall of a not installed product failed - no problem" + else + if ($ExitCode$ = "1641") + comment "looks good: setup program gives exitcode 1641" + comment "ERROR_SUCCESS_REBOOT_INITIATED 1641 The installer has initiated a restart. This message is indicative of a success." + else + if ($ExitCode$ = "3010") + comment "looks good: setup program gives exitcode 3010" + comment "ERROR_SUCCESS_REBOOT_REQUIRED 3010 A restart is required to complete the install. This message is indicative of a success." + else + logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$ + isFatalError + endif + endif + endif +endif + diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins new file mode 100644 index 0000000..ffed542 --- /dev/null +++ b/CLIENT_DATA/setup32.ins @@ -0,0 +1,206 @@ +; 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/ + +[Actions] +requiredWinstVersion >= "4.10.8.6" + +DefVar $MsiId$ +DefVar $UninstallProgram$ +DefVar $LogDir$ +DefVar $ProductId$ +DefVar $MinimumSpace$ +DefVar $InstallDir$ +DefVar $ExitCode$ +DefVar $LicenseRequired$ +DefVar $LicenseKey$ +DefVar $LicensePool$ + +Set $LogDir$ = "%SystemDrive%\tmp" + +; Token BUILDER_VARIABLES will be replaced by opsi-builder.sh +@@BUILDER_VARIABLES@@ + +; ---------------------------------------------------------------- +; - Please edit the following values - +; ---------------------------------------------------------------- +;$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$ = "xlviewer" +Set $MinimumSpace$ = "150 MB" +; the path were we find the product after the installation +Set $InstallDir$ = "%ProgramFiles32Dir%\Microsoft Office\Office12" +Set $LicenseRequired$ = "false" +Set $LicensePool$ = "p_" + $ProductId$ +; ---------------------------------------------------------------- + +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$ + + if FileExists("%ScriptPath%\delsub32.ins") + comment "Start uninstall sub section" + Sub "%ScriptPath%\delsub32.ins" + endif + + Message "Installing " + $ProductId$ + " ..." + + if $LicenseRequired$ = "true" + comment "Licensing required, reserve license and get license key" + Sub_get_licensekey + endif + + comment "Start setup program" + Winbatch_install + 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 + +endif + +[Winbatch_install] +; Choose one of the following examples as basis for your installation +; You can use $LicenseKey$ var to pass a license key to the installer +; +; === MSI package ======================================================================================= +; You may use the parameter PIDKEY=$Licensekey$ +"$InstallExe$" /quiet /passive /norestart +"$InstallSp3Exe$" /quiet /passive /norestart +; + +[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: +; 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: +; parameters: +; working_dir: $InstallDir$ +; 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 +; informations to exit codes see +; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx +; http://msdn.microsoft.com/en-us/library/aa368542.aspx +if ($ExitCode$ = "0") + comment "Looks good: setup program gives exitcode zero" +else + comment "Setup program gives a exitcode unequal zero: " + $ExitCode$ + if ($ExitCode$ = "1605") + comment "ERROR_UNKNOWN_PRODUCT 1605 This action is only valid for products that are currently installed." + comment "Uninstall of a not installed product failed - no problem" + else + if ($ExitCode$ = "1641") + comment "looks good: setup program gives exitcode 1641" + comment "ERROR_SUCCESS_REBOOT_INITIATED 1641 The installer has initiated a restart. This message is indicative of a success." + else + if ($ExitCode$ = "3010") + comment "looks good: setup program gives exitcode 3010" + comment "ERROR_SUCCESS_REBOOT_REQUIRED 3010 A restart is required to complete the install. This message is indicative of a success." + else + logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$ + isFatalError + endif + endif + endif +endif + diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins new file mode 100644 index 0000000..245c6a3 --- /dev/null +++ b/CLIENT_DATA/uninstall32.ins @@ -0,0 +1,67 @@ +; 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/ + +[Actions] +requiredWinstVersion >= "4.10.8.6" + +DefVar $MsiId$ +DefVar $UninstallProgram$ +DefVar $LogDir$ +DefVar $ExitCode$ +DefVar $ProductId$ +DefVar $InstallDir$ +DefVar $LicenseRequired$ +DefVar $LicensePool$ + +Set $LogDir$ = "%SystemDrive%\tmp" + +@@BUILDER_VARIABLES@@ + +; ---------------------------------------------------------------- +; - Please edit the following values - +; ---------------------------------------------------------------- +Set $ProductId$ = "ppviewer" +Set $InstallDir$ = "%ProgramFiles32Dir%\Microsoft Office\Office12" +Set $LicenseRequired$ = "false" +Set $LicensePool$ = "p_" + $ProductId$ +; ---------------------------------------------------------------- + + +comment "Show product picture" +ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ + +Message "Uninstalling " + $ProductId$ + " ..." + +if FileExists("%ScriptPath%\delsub32.ins") + comment "Start uninstall sub section" + Sub "%ScriptPath%\delsub32.ins" +endif + +if $LicenseRequired$ = "true" + comment "Licensing required, free license used" + Sub_free_license +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 + + + diff --git a/ExcelViewer.exe.sha1sum b/ExcelViewer.exe.sha1sum new file mode 100644 index 0000000..594e30c --- /dev/null +++ b/ExcelViewer.exe.sha1sum @@ -0,0 +1 @@ +f386b822000c24cb46782b3f8dbc32e617bc09bd /home/mario/.opsi-dist-cache/xlviewer-2007/X86/ExcelViewer.exe diff --git a/Excel_2007_icons_by_Trazo.jpg.sha1sum b/Excel_2007_icons_by_Trazo.jpg.sha1sum new file mode 100644 index 0000000..f124a78 --- /dev/null +++ b/Excel_2007_icons_by_Trazo.jpg.sha1sum @@ -0,0 +1 @@ +fb620aa2195ca9f1dd67d50b53e833c2fb9eef40 /home/mario/.opsi-dist-cache/xlviewer-2007//Excel_2007_icons_by_Trazo.jpg diff --git a/OPSI/changelog.txt b/OPSI/changelog.txt new file mode 100644 index 0000000..e69de29 diff --git a/OPSI/control b/OPSI/control new file mode 100644 index 0000000..3a07b4f --- /dev/null +++ b/OPSI/control @@ -0,0 +1,31 @@ +[Package] +version: RELEASE +depends: +incremental: False + +[Product] +type: localboot +id: xlviewer +name: Microsoft Excel Viewer +description: Open, view, and print Excel workbooks, even if you don't have Excel installed. +advice: ADVICE +version: VERSION +priority: PRIORITY +licenseRequired: False +productClasses: +setupScript: setup32.ins +uninstallScript: uninstall32.ins +updateScript: +alwaysScript: +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/OPSI/postinst b/OPSI/postinst new file mode 100644 index 0000000..a8e33fc --- /dev/null +++ b/OPSI/postinst @@ -0,0 +1,9 @@ +#! /bin/sh +# +# postinst script for softprod +# This script executes after unpacking files from that archive and registering the product at the server. +# +# The following environment variables can be used to obtain information about the current installation: +# PRODUCT_ID: id of the current product +# CLIENT_DATA_DIR: directory which contains the installed client data +# diff --git a/OPSI/preinst b/OPSI/preinst new file mode 100644 index 0000000..15a5320 --- /dev/null +++ b/OPSI/preinst @@ -0,0 +1,9 @@ +#! /bin/sh +# +# preinst script for softprod +# This script executes before that package will be unpacked from its archive file. +# +# The following environment variables can be used to obtain information about the current installation: +# PRODUCT_ID: id of the current product +# CLIENT_DATA_DIR: directory where client data will be installed +# diff --git a/builder-product.cfg b/builder-product.cfg new file mode 100644 index 0000000..3c9659f --- /dev/null +++ b/builder-product.cfg @@ -0,0 +1,33 @@ +############################ +# Setup product information +############################ +VENDOR="microsoft.com" +PN="xlviewer" +VERSION="2007" +RELEASE="1" +PRIORITY="0" +ADVICE="" + +TYPE="restricted" + +##################### +# File object array +##################### + + +DL_FILE[0]="Excel_2007_icons_by_Trazo.jpg" +DL_SOURCE[0]="http://www.sabes.org/technology/msoffice/msexcel2007/excel2007images/Excel_2007_icons_by_Trazo.jpg" + +DL_FILE[1]="ExcelViewer.exe" +DL_SOURCE[1]="http://download.microsoft.com/download/F/8/8/F88CB355-ECAA-4B74-87D6-C05C81D215BF/ExcelViewer.exe" +DL_ARCH[1]="X86" +DL_WINST_NAME[1]="InstallExe" + +DL_FILE[2]="excelviewer2007sp3-kb2526302-fullfile-de-de.exe" +DL_SOURCE[2]="http://download.microsoft.com/download/B/5/8/B586B77B-07C0-4E1B-849C-D5B46ED9EA13/excelviewer2007sp3-kb2526302-fullfile-de-de.exe" +DL_ARCH[2]="X86" +DL_WINST_NAME[2]="InstallSp3Exe" + +# File array index for the image showing while installing the program +ICON_DL_INDEX=0 + diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh new file mode 100644 index 0000000..a7a2987 --- /dev/null +++ b/builder-targets-cb.sh @@ -0,0 +1,64 @@ +############################################################################## +# This optional file "builder-targets-cb.sh" will be called by builder.sh +# +# The targets will be called from thde opsi-builder using the following +# order: config, prepare, retrieve, create, package, publish, commit, cleanup +# You can overwrite the target functions in builder-targets-cb.sh +# +# You can define callback functions. The functions are called from +# opsi-builder within processing a target +# cb_package_makeproductfile +# +# You can use every variable defined in any configuration file or by +# the defined builder script itself. Also, calling the predefined +# targets builder_ is possible. +# +# Abstract: +# target order: config, prepare, retrieve, create, package, publish, commit, cleanup +# callbacks: +# +############################################################################## + +#function config() { +# echo "Config - doing some commands before calling the builder_config" +# builder_config +# echo "Config - doing some commands after calling the builder_config" +#} + +#function prepare() { +# echo "Prepare" +# builder_prepare +#} + +function retrieve() { + echo "Retrieve" + builder_retrieve +} + +function create() { + echo "Create" + builder_create +} + +function package() { + echo "Package" + builder_package +} + +function publish() { + echo "Publish" + builder_publish +} + +function commit() { + echo "Commit" + builder_commit +} +function cleanup() { + echo "Cleanup: output_dir: $OUTPUT_DIR" +# cp -a ${OUTPUT_DIR}/${OPSI_REPOS_FILE_PATTERN}.opsi /tmp/tmviewer.opsi +# chmod 666 /tmp/tmviewer.opsi +# ls -altr /tmp/tmviewer.opsi + + builder_cleanup +} diff --git a/excelviewer2007sp3-kb2526302-fullfile-de-de.exe.sha1sum b/excelviewer2007sp3-kb2526302-fullfile-de-de.exe.sha1sum new file mode 100644 index 0000000..2597bb0 --- /dev/null +++ b/excelviewer2007sp3-kb2526302-fullfile-de-de.exe.sha1sum @@ -0,0 +1 @@ +110cb8726ca645db959ae6d1d949ed1822956b36 /home/mario/.opsi-dist-cache/xlviewer-2007/X86/excelviewer2007sp3-kb2526302-fullfile-de-de.exe