X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-addtopackage;h=1964b77589e29f6cf58778cb3b8e24fdc4a57cc0;hb=d11b147990e969dc101bb34e744380199028a90f;hp=05c35963713f4b310f213f2861489cdb61fa039d;hpb=cc86639ed2cb9237b75ddb603b101929a3ee71d6;p=zpackage

diff --git a/zpm-addtopackage b/zpm-addtopackage
index 05c3596..1964b77 100755
--- a/zpm-addtopackage
+++ b/zpm-addtopackage
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-package=${1:-$ZPMPACKAGE}
-shift
 pkgver=${ZPMPKGVER:-1.0}
 pkgrel=${ZPMPKGREL:-1}
 
@@ -24,6 +22,10 @@ while getopts :f:v:r:d:a:u:l:p:b:P: opt; do
 		c) tags="$tags +configuration" ;;
 	esac
 done
+shift $((OPTIND - 1))
+
+package="$1"
+shift
 
 set -e
 if [ -z "$pkgfile" ]; then
@@ -33,11 +35,7 @@ fi
 if [ ! -f $pkgfile ]; then
 	zpm newpackage $package || exit 1
 else
-	appid=$(sqlite3 $pkgfile 'pragma application_id;' | ( echo obase = 16; cat - ) | bc)
-	if [ "$appid" != "5A504442" ]; then
-		echo $pkgfile does not appear to be a zpm package file
-		exit 1
-	fi
+	zpm test -v $pkgfile
 fi
 
 for path in $*; do