From cb319777926fbee07c96a5f28aacb243f3e6353d Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Wed, 22 Mar 2017 23:53:23 -0500 Subject: [PATCH] use zpm-test -v for valid db checks --- zpm-addtopackage | 6 +----- zpm-fileinfo | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/zpm-addtopackage b/zpm-addtopackage index 05c3596..cccd12d 100755 --- 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 93326e5..bf4be1d 100755 --- 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 <