From 0835b00e3788187bb1bfccf3f6ff333d186aebf7 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 11 Mar 2013 20:43:35 +0100 Subject: [PATCH] update to new opsi builder --- CLIENT_DATA/setup.ins | 13 ++--- build.sh | 132 ------------------------------------------ builder-product.cfg | 2 + 3 files changed, 8 insertions(+), 139 deletions(-) delete mode 100644 build.sh diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins index e3abf71..6ce7e43 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.gentiumplus" Set $MinimumSpace$ = "10 MB" ; the path were we find the product after the installation -Set $InstallDir32$ = "%ProgramFiles32Dir%\Gentium" -Set $InstallDir64$ = "%ProgramFiles64Dir%\Gentium" +Set $InstallDir32$ = "%ProgramFiles32Dir%\GentiumPlus" +Set $InstallDir64$ = "%ProgramFiles64Dir%\GentiumPlus" ; ---------------------------------------------------------------- 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/build.sh b/build.sh deleted file mode 100644 index a08ffeb..0000000 --- a/build.sh +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/sh -PN="font-gentium-plus" -VERSION="1.504" -RELEASE="2" -PRIORITY="0" -ADVICE="" -TYPE="public" -# all downloads should not have any traling parameters like ?downlaodid=1234 .....(should rewrite in python) -ICON="http://www.wycliffe.org/images/ABOUT/Logos/SIL-Logo-No-Tag-Color.jpg" -X86="http://code.kliu.org/misc/fontreg/fontreg-2.1.3-redist.7z" -X86_1="http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=GentiumPlus-1.504.zip&filename=GentiumPlus-1.504.zip" -#AMD64="http://downloads.sourceforge.net/sevenzip/7z920-x64.msi" -ICONFILE=${ICON##*/} -X86FILE=${X86##*/} -X86FILE_1="GentiumPlus-1.504.zip" -#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 - mkdir -p $OUT/$PN/CLIENT_DATA/files - #cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA/files - 7z x -o$OUT/$PN/CLIENT_DATA/files /usr/portage/distfiles/$X86FILE - cp $OUT/$PN/CLIENT_DATA/files/bin.x86-32/FontReg.exe $OUT/$PN/CLIENT_DATA/files/FontReg32.exe - cp $OUT/$PN/CLIENT_DATA/files/bin.x86-64/FontReg.exe $OUT/$PN/CLIENT_DATA/files/FontReg64.exe - rm -rf $OUT/$PN/CLIENT_DATA/files/bin.* $OUT/$PN/CLIENT_DATA/files/src - 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 - #plowdown -o /usr/portage/distfiles $X86 - exit 1 - fi - - if [ -e /usr/portage/distfiles/$X86FILE_1 ] - then - if [ -e $X86FILE_1.sha1sum ] - then - SHA1SUM=`cat $X86FILE_1.sha1sum` - CHECKSUM=`sha1sum /usr/portage/distfiles/$X86FILE_1` - if [ "$CHECKSUM" = "$SHA1SUM" ] - then - #cp /usr/portage/distfiles/$X86FILE $OUT/$PN/CLIENT_DATA - #mkdir -p $OUT/$PN/CLIENT_DATA/files - 7z e -o$OUT/$PN/CLIENT_DATA/files /usr/portage/distfiles/$X86FILE_1 - else - echo "The checksums do not match." - exit 1 - fi - else - echo "You need to create the checksums with: sha1sum /usr/portage/distfiles/$X86FILE_1 > $X86FILE_1.sha1sum" - exit 1 - fi - else - echo "Downloading file" - wget -O /usr/portage/distfiles/$X86FILE_1 $X86_1 - #plowdown -o /usr/portage/distfiles $X86 - 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 - diff --git a/builder-product.cfg b/builder-product.cfg index e5b843d..a02c248 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -3,6 +3,8 @@ ############################ VENDOR="scripts.sil.org" PN="font.gentiumplus" +NAME="Gentium Plus Free Font" +DESCRIPTION="Gentium Plus Free Font" VERSION="1.510" RELEASE="3" PRIORITY="0"