commit 5a34279a5692956c26764f50f193fe76d143c9ae Author: Mario Fetka Date: Sun Jun 26 08:07:42 2011 +0200 initial checkin diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins new file mode 100644 index 0000000..aba0747 --- /dev/null +++ b/CLIENT_DATA/delsub32.ins @@ -0,0 +1,95 @@ +; 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$ = '{F1CECE09-7CBE-4E98-B435-DA87CDA86167}' +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..efcf09b --- /dev/null +++ b/CLIENT_DATA/setup32.ins @@ -0,0 +1,202 @@ +; 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" + +; ---------------------------------------------------------------- +; - 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$ = "skype" +Set $MinimumSpace$ = "30 MB" +; the path were we find the product after the installation +Set $InstallDir$ = "%ProgramFiles32Dir%\Skype" +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$ +msiexec /i "%ScriptPath%\X86FILE" /l* "$LogDir$\$ProductId$.install_log.txt" /qb! ALLUSERS=2 REBOOT=ReallySuppress +; + +[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..b4ed0a4 --- /dev/null +++ b/CLIENT_DATA/uninstall32.ins @@ -0,0 +1,65 @@ +; 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" + +; ---------------------------------------------------------------- +; - Please edit the following values - +; ---------------------------------------------------------------- +Set $ProductId$ = "skype" +Set $InstallDir$ = "%ProgramFiles32Dir%\Skype" +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/OPSI/changelog.txt b/OPSI/changelog.txt new file mode 100644 index 0000000..0e0367f --- /dev/null +++ b/OPSI/changelog.txt @@ -0,0 +1,103 @@ +opsi-template (4.0-1) stable; urgency=low + + * requires opsi.winst 4.10.8 + * default: 32Bit Version + * additional: 64Bit Version + * additional: 32/64Bit Version + + -- detlef oertel Wed, 18 Jan 2011 16:01:53 +0200 + + +opsi-template (1.0-20) stable; urgency=low + + * removed EnvVar("temp") + * all variable definitions at top + * new loglevel + * removed $NewExe$ + * more infos for inno setup + * removed number at showBitmap + * Initial section removed + * example for $installDir$ changed + + -- detlef oertel Wed, 14 Apr 2010 16:01:53 +0200 + + +opsi-template (1.0-19) stable; urgency=low + + * adding 'Installshield + MSI' to the Winbatch_install section + * changing to 'if $LicenseRequired$ = "true"' from 'if not ($LicenseRequired$ = "false")' + * changed from .ins to 'setup.ins' + + -- detlef oertel Tue, 26 Jan 2010 16:01:53 +0200 + + +opsi-template (1.0-18) stable; urgency=low + * bug fix in the successful request (comment out) + +opsi-template (1.0-17) stable; urgency=low + + * bug fix in delsub.ins : deleting a shortcut from AllUsers desktop + + -- detlef oertel Mon, 28 Sep 2009 16:01:53 +0200 + +opsi-template (1.0-16) stable; urgency=low + + * Added some examples for other installers + * Some cleanups + * More examples in other sections + + -- Jan Schneider Fri, 18 Sep 2009 13:01:53 +0200 + +opsi-template (1.0-15) stable; urgency=low + + * bugfix for delopsi-template + + -- Rupert Roeder Mon, 06 Jun 2009 11:15:00 +0100 + +opsi-template (1.0-14) stable; urgency=low + + * bugfix for delopsi-template + + -- Rupert Roeder Tue, 26 May 2009 11:15:00 +0100 + +opsi-template (1.0-13) stable; urgency=low + + * some corrections + + -- Rupert Roeder Tue, 26 May 2009 11:15:00 +0100 + +opsi-template (1.0-12) stable; urgency=low + + * code for license management added + + -- Rupert Roeder Tue, 19 May 2009 11:15:00 +0100 + +opsi-template (1.0-11) stable; urgency=low + + * sub_check_exitcode modified + * sub_check_exitcode 1641 added + * sub_check_exitcode integrated in delsub.ins + + -- Detlef Oertel Mon, 18 May 2009 14:15:00 +0100 + +opsi-template (1.0-10) stable; urgency=low + + * modified test on exit code added 3010 success restart required + -- bardo wolf + +opsi-template (1.0-9) stable; urgency=low + + * renamed from softprod to opsi-template + * added test on exit code + + -- Detlef Oertel Fri, 13 Mar 2009 12:35:32 +0100 + +opsi-template (1.0-8) stable; urgency=low + + * comment Anweisungen + * delsub: + [Files_uninstall] + ;something like (don't forget the trailing backslash) + ;delete -sf "$InstallDir$\" + + -- Detlef Oertel Wed, 5 Nov 2008 17:00:00 +0100 diff --git a/OPSI/control b/OPSI/control new file mode 100644 index 0000000..7384bb7 --- /dev/null +++ b/OPSI/control @@ -0,0 +1,39 @@ +[Package] +version: RELEASE +depends: +incremental: False + +[Product] +type: localboot +id: skype +name: Skype +description: Skype ist eine kostenlose VoIP-Software mit Instant-Messaging-Funktion, Dateiuebertragung und Videotelefonie, die ein proprietaeres Protokoll verwendet. +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"] + +[ProductDependency] +action: setup +requiredProduct: firefox +requiredStatus: installed +requirementType: before + + 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/SkypeSetup.msi.sha1sum b/SkypeSetup.msi.sha1sum new file mode 100644 index 0000000..afee9ee --- /dev/null +++ b/SkypeSetup.msi.sha1sum @@ -0,0 +1 @@ +834835ff1cc427946e4b6c15f9bea8fad565e8c4 /usr/portage/distfiles/SkypeSetup.msi diff --git a/Skype_logo.png.sha1sum b/Skype_logo.png.sha1sum new file mode 100644 index 0000000..0686f7f --- /dev/null +++ b/Skype_logo.png.sha1sum @@ -0,0 +1 @@ +fca147f59a62408e12bfa70c8abb9b58cbe3a80b /usr/portage/distfiles/Skype_logo.png diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..e61f21f --- /dev/null +++ b/build.sh @@ -0,0 +1,121 @@ +#!/bin/sh +PN="skype" +VERSION="5.3.32.120" +RELEASE="2" +PRIORITY="0" +ADVICE="" +TYPE="public" +# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python) +ICON="http://edutechdatabase.wikispaces.com/file/view/Skype_logo.png/190117730/Skype_logo.png" +X86="http://download.skype.com/SkypeSetup.msi" +#AMD64="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi" +ICONFILE=${ICON##*/} +X86FILE=${X86##*/} +#AMD64FILE=${AMD64##*/} + + if [ -e /var/tmp/opsi/upload/$TYPE/${PN}_${VERSION}-${RELEASE}.opsi ] + then + echo "package ${PN}_${VERSION}-${RELEASE}.opsi already generated" + exit 1 + fi + +OUT=$(mktemp -d /tmp/output.XXXXXXXXXX) || { echo "Failed to create temp dir"; exit 1; } +mkdir $OUT/$PN +cp -Rv OPSI CLIENT_DATA $OUT/$PN +unix2dos $OUT/$PN/CLIENT_DATA/* + + if [ -e /usr/portage/distfiles/$ICONFILE ] + then + if [ -e $ICONFILE.sha1sum ] + then + SHA1SUM=`cat $ICONFILE.sha1sum` + CHECKSUM=`sha1sum /usr/portage/distfiles/$ICONFILE` + if [ "$CHECKSUM" = "$SHA1SUM" ] + then + convert -colorspace rgb /usr/portage/distfiles/$ICONFILE -transparent white -background transparent -resize 160x160\> \ + -size 160x160 xc:transparent +swap -gravity center -composite $OUT/$PN/CLIENT_DATA/$PN.png + else + echo "The checksums do not match." + exit 1 + fi + else + echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$ICONFILE > $ICONFILE.sha1sum" + exit 1 + fi + else + echo "Downloading file" + wget -P /usr/portage/distfiles/ $ICON + exit 1 + fi + + if [ -e /usr/portage/distfiles/$X86FILE ] + then + if [ -e $X86FILE.sha1sum ] + then + SHA1SUM=`cat $X86FILE.sha1sum` + CHECKSUM=`sha1sum /usr/portage/distfiles/$X86FILE` + if [ "$CHECKSUM" = "$SHA1SUM" ] + then + cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA + else + echo "The checksums do not match." + exit 1 + fi + else + echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$X86FILE > $X86FILE.sha1sum" + exit 1 + fi + else + echo "Downloading file" + wget -O /usr/portage/distfiles/$X86FILE $X86 + exit 1 + fi + +# if [ -e /usr/portage/distfiles/$AMD64FILE ] +# then +# if [ -e $AMD64FILE.sha1sum ] +# then +# SHA1SUM=`cat $AMD64FILE.sha1sum` +# CHECKSUM=`sha1sum /usr/portage/distfiles/$AMD64FILE` +# if [ "$CHECKSUM" = "$SHA1SUM" ] +# then +# cp /usr/portage/distfiles/$AMD64FILE $OUT/$PN/CLIENT_DATA +# else +# echo "The checksums do not match." +# exit 1 +# fi +# else +# echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$AMD64FILE > $AMD64FILE.sha1sum" +# exit 1 +# fi +# else +# echo "Downloading file" +# wget -P /usr/portage/distfiles/ $AMD64 +# exit 1 +# fi + +sed -e "s!VERSION!$VERSION!g" -e "s!RELEASE!$RELEASE!g" -e "s!PRIORITY!$PRIORITY!g" -e "s!ADVICE!$ADVICE!g" -i $OUT/$PN/OPSI/control +#sed -e "s!X86FILE!$X86FILE!g" -e "s!AMD64FILE!$AMD64FILE!g" -i $OUT/$PN/CLIENT_DATA/setup.ins +sed -e "s!X86FILE!$X86FILE!g" -i $OUT/$PN/CLIENT_DATA/setup32.ins + +if test -d ".git"; then + git log --date-order --date=short | \ + sed -e '/^commit.*$/d' | \ + awk '/^Author/ {sub(/\\$/,""); getline t; print $0 t; next}; 1' | \ + sed -e 's/^Author: //g' | \ + sed -e 's/>Date: \([0-9]*-[0-9]*-[0-9]*\)/>\t\1/g' | \ + sed -e 's/^\(.*\) \(\)\t\(.*\)/\3 \1 \2/g' > $OUT/$PN/OPSI/changelog.txt +else + echo "No git repository present." + exit 1 +fi + +pushd $OUT +opsi-makeproductfile -v $OUT/$PN +popd + +mkdir -p /var/tmp/opsi/upload/$TYPE/ +cp -afv $OUT/*.opsi /var/tmp/opsi/upload/$TYPE/ + +rm -rf $OUT +