From 34ff8fc85b5039ca870ffc02920dfec990e4d307 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 11 Mar 2013 19:44:32 +0100 Subject: [PATCH] update to new opsi builder --- C64_logo.JPG.sha1sum | 1 + CLIENT_DATA/setup.ins | 13 ++++++------- builder-product.cfg | 6 ++++-- commodore.png.sha1sum | 1 - 4 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 C64_logo.JPG.sha1sum delete mode 100644 commodore.png.sha1sum diff --git a/C64_logo.JPG.sha1sum b/C64_logo.JPG.sha1sum new file mode 100644 index 0000000..afea8ef --- /dev/null +++ b/C64_logo.JPG.sha1sum @@ -0,0 +1 @@ +a462b4e5c895740ef6f420123605db83ec9d2494 /home/mario/.opsi-dist-cache/font.commodore64-1.10//C64_logo.JPG diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins index 0214e68..a31a218 100644 --- a/CLIENT_DATA/setup.ins +++ b/CLIENT_DATA/setup.ins @@ -4,7 +4,7 @@ ; credits: http://www.opsi.org/credits/ [Actions] -requiredWinstVersion >= "4.10.8.6" +requiredWinstVersion >= "4.11.2.6" DefVar $ProductId$ DefVar $MinimumSpace$ @@ -37,11 +37,10 @@ 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$ = "font.commodore64" Set $MinimumSpace$ = "10 MB" ; the path were we find the product after the installation -Set $InstallDir32$ = "%ProgramFiles32Dir%\Commodore" -Set $InstallDir64$ = "%ProgramFiles64Dir%\Commodore" +Set $InstallDir32$ = "%ProgramFiles32Dir%\Commodore64" +Set $InstallDir64$ = "%ProgramFiles64Dir%\Commodore64" ; ---------------------------------------------------------------- if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) @@ -50,12 +49,12 @@ if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) ; Stop process and set installation status to failed else comment "Show product picture" - ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ + ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ 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 "Copy files" Files_install_32 /32Bit comment "Start setup program" @@ -68,7 +67,7 @@ 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 "Copy files" Files_install_64 /64Bit comment "Start setup program" diff --git a/builder-product.cfg b/builder-product.cfg index 757d6b9..2d61ae0 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,6 +3,8 @@ ############################ VENDOR="goldparser.org" PN="font.commodore64" +NAME="Commodore Alike Free Font" +DESCRIPTION="Commodore Alike Free Font" VERSION="1.10" RELEASE="3" PRIORITY="0" @@ -14,8 +16,8 @@ TYPE="public" # -DL_FILE[0]="commodore.png" -DL_SOURCE[0]="http://www.gamesaktuell.de/screenshots/original/2011/04/commodore.png" +DL_FILE[0]="C64_logo.JPG" +DL_SOURCE[0]="http://images2.wikia.nocookie.net/__cb20070413171159/egamia/images/2/21/C64_logo.JPG" DL_FILE[1]="Commodore-64-Fonts.zip" DL_SOURCE[1]="http://goldparser.org/misc/Commodore-64-Fonts.zip" diff --git a/commodore.png.sha1sum b/commodore.png.sha1sum deleted file mode 100644 index b76fab1..0000000 --- a/commodore.png.sha1sum +++ /dev/null @@ -1 +0,0 @@ -c2af99539aabd1bd52f4b714b96c3c2e7c6b02fd /usr/portage/distfiles/commodore.png