From 414d2fc7722e87f68ca52002be747cbf6003b067 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sun, 10 Mar 2013 18:44:50 +0100 Subject: [PATCH] update to new ospi builder --- 451604026_a750b0de57.jpg.sha1sum | 1 - CLIENT_DATA/delsub3264.ins | 62 +++++++++++++++--------- CLIENT_DATA/login.ins | 24 +++++++++ CLIENT_DATA/opsi-artifex.ghostscript.ini | 7 +++ CLIENT_DATA/setup3264.ins | 40 +++++++++------ CLIENT_DATA/uninstall3264.ins | 28 ++++++----- builder-product.cfg | 15 ++++-- gpl_ghostscript_icon_120.png.sha1sum | 1 + 8 files changed, 121 insertions(+), 57 deletions(-) delete mode 100644 451604026_a750b0de57.jpg.sha1sum create mode 100644 CLIENT_DATA/login.ins create mode 100644 CLIENT_DATA/opsi-artifex.ghostscript.ini create mode 100644 gpl_ghostscript_icon_120.png.sha1sum diff --git a/451604026_a750b0de57.jpg.sha1sum b/451604026_a750b0de57.jpg.sha1sum deleted file mode 100644 index beeb6c4..0000000 --- a/451604026_a750b0de57.jpg.sha1sum +++ /dev/null @@ -1 +0,0 @@ -8d5fbc83d0e90f52e4de890b231d487df58c64f6 /home/mario/.opsi-dist-cache/ghostscript-9.0.0//451604026_a750b0de57.jpg diff --git a/CLIENT_DATA/delsub3264.ins b/CLIENT_DATA/delsub3264.ins index 761d785..af428b9 100644 --- a/CLIENT_DATA/delsub3264.ins +++ b/CLIENT_DATA/delsub3264.ins @@ -1,26 +1,33 @@ ; 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 $OldUninstallProgram32$ = $OldInstallDir32$ + "\uninstgs.exe" - -Set $OldUninstallProgram64$ = $OldInstallDir64$ + "\uninstgs.exe" - Set $UninstallProgram32$ = $InstallDir32$ + "\uninstgs.exe" +Set $UninstallProgramOld32$ = $InstallDir32$ + "\" + $UninstallProg32$ +Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" Set $UninstallProgram64$ = $InstallDir64$ + "\uninstgs.exe" +Set $UninstallProgramOld64$ = $InstallDir64$ + "\" + $UninstallProg64$ +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($OldUninstallProgram32$) - comment "Uninstall program found, starting uninstall" - Winbatch_uninstall_32_old - sub_check_exitcode + 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 $UninstallProgramOld32$ = GetValueFromInifile($IniFile$,"X86","UninstallProg32","XXXXXXXX.exe") + if FileExists($UninstallProgramOld32$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_old_32 + sub_check_exitcode + endif + endif if FileExists($UninstallProgram32$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_32 @@ -34,14 +41,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($OldUninstallProgram64$) - comment "Uninstall program found, starting uninstall" - Winbatch_uninstall_64_old - sub_check_exitcode + 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 $UninstallProgramOld64$ = GetValueFromInifile($IniFile$,"X86_64","UninstallProg64","XXXXXXXX.exe") + if FileExists($UninstallProgramOld64$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_old_64 + sub_check_exitcode + endif + endif if FileExists($UninstallProgram64$) comment "Uninstall program found, starting uninstall" Winbatch_uninstall_64 @@ -57,8 +71,8 @@ endif comment "Delete program shortcuts" LinkFolder_uninstall -[Winbatch_uninstall_32_old] -"$OldUninstallProgram32$" /S +[Winbatch_uninstall_old_32] +"$UninstallProgramOld32$" /S [Winbatch_uninstall_32] "$UninstallProgram32$" /S @@ -66,18 +80,18 @@ LinkFolder_uninstall [Files_uninstall_32] ; Example for recursively deleting the installation directory (don't forget the trailing backslash): ; -; delete -sf "$InstallDir32$\" +delete -sf "$InstallDir32$\" -[Winbatch_uninstall_64_old] -"$OldUninstallProgram64$" /S +[Winbatch_uninstall_old_64] +"$UninstallProgramOld64$" /S [Winbatch_uninstall_64] "$UninstallProgram64$" /S [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: 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-artifex.ghostscript.ini b/CLIENT_DATA/opsi-artifex.ghostscript.ini new file mode 100644 index 0000000..3bcccd3 --- /dev/null +++ b/CLIENT_DATA/opsi-artifex.ghostscript.ini @@ -0,0 +1,7 @@ +[X86] + +[X86_64] + +[COMMON] +PN=name +VERSION=version diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index dfaa7bb..ea190d2 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -1,30 +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 $OldUninstallProgram32$ -DefVar $OldUninstallProgram64$ DefVar $UninstallProgram32$ +DefVar $UninstallProgramOld32$ +DefVar $IniFile32$ DefVar $UninstallProgram64$ +DefVar $UninstallProgramOld64$ +DefVar $IniFile64$ +DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ProductId$ DefVar $MinimumSpace$ -DefVar $OldInstallDir32$ -DefVar $OldInstallDir64$ DefVar $InstallDir32$ DefVar $InstallDir64$ DefVar $ExitCode$ 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 @@ -43,22 +46,21 @@ 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$ = "artifex.ghostscript" Set $MinimumSpace$ = "30 MB" ; the path were we find the product after the installation -Set $InstallDir32$ = "%ProgramFiles32Dir%\gs\gs" + $VERSION$ -Set $InstallDir64$ = "%ProgramFiles64Dir%\gs\gs" + $VERSION$ -Set $OldInstallDir32$ = "%ProgramFiles32Dir%\gs\gs" + $OLDVERSION$ -Set $OldInstallDir64$ = "%ProgramFiles64Dir%\gs\gs" + $OLDVERSION$ +Set $InstallDir32$ = "%ProgramFiles32Dir%\gs" +Set $InstallDir64$ = "%ProgramFiles64Dir%\gs" ; ---------------------------------------------------------------- +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" @@ -68,8 +70,9 @@ 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%" Winbatch_install_32 Sub_check_exitcode comment "Copy files" @@ -81,8 +84,9 @@ 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%" Winbatch_install_64 Sub_check_exitcode comment "Copy files" @@ -99,6 +103,9 @@ endif "$Install32Exe$" /S [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$" @@ -107,6 +114,9 @@ endif "$Install64Exe$" /S [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$" diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins index ac0c45d..3c552b1 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -1,29 +1,32 @@ ; 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 $OldUninstallProgram32$ -DefVar $OldUninstallProgram64$ DefVar $UninstallProgram32$ +DefVar $UninstallProgramOld32$ +DefVar $IniFile32$ DefVar $UninstallProgram64$ +DefVar $UninstallProgramOld64$ +DefVar $IniFile64$ +DefVar $IniCfgFile$ DefVar $LogDir$ DefVar $ExitCode$ DefVar $ProductId$ -DefVar $OldInstallDir32$ -DefVar $OldInstallDir64$ DefVar $InstallDir32$ DefVar $InstallDir64$ 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 @@ -39,16 +42,14 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $ProductId$ = "artifex.ghostscript" -Set $InstallDir32$ = "%ProgramFiles32Dir%\gs\gs" + $VERSION$ -Set $InstallDir64$ = "%ProgramFiles64Dir%\gs\gs" + $VERSION$ -Set $OldInstallDir32$ = "%ProgramFiles32Dir%\gs\gs" + $OLDVERSION$ -Set $OldInstallDir64$ = "%ProgramFiles64Dir%\gs\gs" + $OLDVERSION$ +Set $InstallDir32$ = "%ProgramFiles32Dir%\gs" +Set $InstallDir64$ = "%ProgramFiles64Dir%\gs" ; ---------------------------------------------------------------- +Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" comment "Show product picture" -ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ +ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." @@ -56,3 +57,4 @@ if FileExists("%ScriptPath%\delsub3264.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub3264.ins" endif + diff --git a/builder-product.cfg b/builder-product.cfg index bfa6cd3..42e15bb 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,6 +3,8 @@ ############################ VENDOR="ghostscript.com" PN="artifex.ghostscript" +NAME="Ghostscript" +DESCRIPTION="Ghostscript ist ein freier Interpreter der Seitenbeschreibungssprachen PostScript und Portable Document Format (PDF)." VERSION="9.07" RELEASE="1" PRIORITY="0" @@ -12,8 +14,8 @@ ADVICE="" # Valid value: restricted | public TYPE="public" -DL_FILE[0]="451604026_a750b0de57.jpg" -DL_SOURCE[0]="http://download.chip.eu/ii/451604026_a750b0de57.jpg" +DL_FILE[0]="gpl_ghostscript_icon_120.png" +DL_SOURCE[0]="http://pliki.onet.pl/zdjecia/pliki/g/gpl_ghostscript_icon_120.png" DL_FILE[1]="gs907w32.exe" DL_SOURCE[1]="http://downloads.ghostscript.com/public/gs907w32.exe" @@ -28,5 +30,10 @@ DL_WINST_NAME[2]=Install64Exe # File array index for the image showing while installing the program ICON_DL_INDEX=0 -WINST_NAME[0]="OLDVERSION" -WINST_VALUE[0]="9.06" \ No newline at end of file +OPSI_INI_SECTION[0]="X86" +OPSI_INI_OPTION[0]="UninstallProg32" +OPSI_INI_VALUE[0]="${VERSION}\uninstgs.exe" + +OPSI_INI_SECTION[1]="X86_64" +OPSI_INI_OPTION[1]="UninstallProg64" +OPSI_INI_VALUE[1]="${VERSION}\uninstgs.exe" \ No newline at end of file diff --git a/gpl_ghostscript_icon_120.png.sha1sum b/gpl_ghostscript_icon_120.png.sha1sum new file mode 100644 index 0000000..2635e34 --- /dev/null +++ b/gpl_ghostscript_icon_120.png.sha1sum @@ -0,0 +1 @@ +2763c1e87ff0e3a785223c66e7aa71511a6835a7 /home/mario/.opsi-dist-cache/artifex.ghostscript-9.07//gpl_ghostscript_icon_120.png