use zpm-test -v for valid db checks

diff --git a/zpm-addtopackage b/zpm-addtopackage
index 05c35963713f4b310f213f2861489cdb61fa039d..cccd12de666d3ce2c0574207583f2120401448db 100755 (executable)
--- a/zpm-addtopackage
+++ b/zpm-addtopackage
@@ -33,11 +33,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

diff --git a/zpm-fileinfo b/zpm-fileinfo
index 93326e50d1e6b27e7590d387f7f14ca527cab16d..bf4be1d0428d9347aa413a0adf850065db8d0247 100755 (executable)
--- a/zpm-fileinfo
+++ b/zpm-fileinfo
@@ -32,11 +32,7 @@ if [ -z "$pkgfile" ]; then
        pkgfile="$package-$pkgver-$pkgrel.zpm"
 fi
 
-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
 
 {
 sqlite3 $pkgfile <<EOS