X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=testdata%2Fscripts%2Fpnd_make.sh;h=3a0ce2cd1468c0adbe17ff7e891cd45e0d3eaac2;hb=303fbe209ab8aa5f26224a18873d84e28fa8c305;hp=c5e5111cf22d03a6935b7f0a7bfed72adaad5e0e;hpb=68e9a319811e5bb68691a1246abfb439cf29bd18;p=pandora-libraries.git diff --git a/testdata/scripts/pnd_make.sh b/testdata/scripts/pnd_make.sh index c5e5111..3a0ce2c 100755 --- a/testdata/scripts/pnd_make.sh +++ b/testdata/scripts/pnd_make.sh @@ -2,7 +2,7 @@ ######adjust path of genpxml.sh if you want to use that "feture"##### -TEMP=`getopt -o p:d:x:i: -- "$@"` +TEMP=`getopt -o p:d:x:i:c -- "$@"` if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi @@ -13,7 +13,7 @@ while true ; do -d) echo "FOLDER set to $2" ;FOLDER=$2;shift 2 ;; -x) echo "PXML set to $2" ;PXML=$2;shift 2 ;; -i) echo "ICON set to $2" ;ICON=$2;shift 2 ;; - -c) echo "-c set, will create compressed squasfs image instead of iso $2" ;SQUASH=1;shift 2 ;; + -c) echo "-c set, will create compressed squasfs image instead of iso $2" ;SQUASH=1;shift 1 ;; --) shift ; break ;; *) echo "Error while parsing arguments! $2" ; exit 1 ;; esac @@ -41,7 +41,11 @@ if [ ! -f $PXML ]; then echo "$PXML doesnt exist"; exit 1; fi #check if pxml act if [ ! $SQUASH ]; then mkisofs -o $PNDNAME.iso -R $FOLDER else - mksquashfs $FOLDER $PNDNAME.iso + if [ $(mksquashfs -version | awk '{if ($3 >= 4) print 1}') = 1 ]; then + echo "your squashfs version is older then version 4, pleas upgrade to 4.0 or later" + exit 1 + fi + mksquashfs -no-recovery -nopad $FOLDER $PNDNAME.iso fi #append pxml to iso cat $PNDNAME.iso $PXML > $PNDNAME