From: Nathan Wagner <nw@hydaspes.if.org>
Date: Thu, 4 Jan 2018 16:29:53 +0000 (-0600)
Subject: use zpm shell instead of sqlite3
X-Git-Tag: v0.1.6~116
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=95c91056eb1fea49f96dcc2b1c5b91930e0b960a

use zpm shell instead of sqlite3
---

diff --git a/zpm-addtopackage b/zpm-addtopackage
index 9c66169..a2e5aee 100755
--- a/zpm-addtopackage
+++ b/zpm-addtopackage
@@ -120,7 +120,7 @@ for path in $*; do
 			;;
 	esac
 
-	sqlite3 $pkgfile <<EOS
+	zpm shell $pkgfile <<EOS
 PRAGMA foreign_keys = ON;
 begin;
 insert or replace into packagefiles (package,version,release,path,mode,mtime,username,groupname,filetype,hash,target)
diff --git a/zpm-fileinfo b/zpm-fileinfo
index bf4be1d..5d49be5 100755
--- a/zpm-fileinfo
+++ b/zpm-fileinfo
@@ -32,10 +32,10 @@ if [ -z "$pkgfile" ]; then
 	pkgfile="$package-$pkgver-$pkgrel.zpm"
 fi
 
-zpm-test -v $pkgfile
+zpm test -v $pkgfile
 
 {
-sqlite3 $pkgfile <<EOS
+zpm shell $pkgfile <<EOS
 .mode line
 select * from packages where package = '$package' and version = '$pkgver' and release = $pkgrel
 ;
diff --git a/zpm-install b/zpm-install
index 8d259c0..be851ac 100755
--- a/zpm-install
+++ b/zpm-install
@@ -73,7 +73,7 @@ else
 fi
 
 pathlist() {
-	sqlite3 $pkgfile<<EOS
+	zpm shell $pkgfile<<EOS
 select path from packagefiles
 	where package||'-'||version||'-'||release = '$pkg'
 	;
diff --git a/zpm-ipkgfile b/zpm-ipkgfile
index 04f980e..0de0397 100755
--- a/zpm-ipkgfile
+++ b/zpm-ipkgfile
@@ -25,7 +25,7 @@ die() {
 }
 
 pkgfileinfo() {
-	sqlite3 $pkgfile<<EOS
+	zpm shell $pkgfile<<EOS
 select $1 from packagefiles
 	where path='$2'
 	and package||'-'||version||'-'||release = '$pkg'
diff --git a/zpm-newpackage b/zpm-newpackage
index 3afabb6..31d1b98 100755
--- a/zpm-newpackage
+++ b/zpm-newpackage
@@ -47,7 +47,7 @@ if [ "$idempotent" = 1 ]; then
 	idempotent='or ignore'
 fi
 
-sqlite3 $pkgfile <<EOS
+zpm shell $pkgfile <<EOS
 insert $idempotent into packages ("package", "version", "release", "build_time")
 values ('$package', '$pkgver', $pkgrel, $builddate)
 ;
diff --git a/zpm-pkg b/zpm-pkg
index 30630d3..67f9eb1 100755
--- a/zpm-pkg
+++ b/zpm-pkg
@@ -27,9 +27,9 @@ if [ ! -f $pkgfile ]; then
 fi
 
 for path in $*; do
-	hash=$(./zpm-addfile $pkgfile $path)
+	hash=$(zpm addfile $pkgfile $path)
 
-sqlite3 $pkgfile <<EOS
+zpm shell $pkgfile <<EOS
 insert into packagefiles
 values ('$package', nullif('$subpackage', ''), '$hash', '$path', NULL)
 ;
diff --git a/zpm-pkginfo b/zpm-pkginfo
index bf735c7..3be0e03 100755
--- a/zpm-pkginfo
+++ b/zpm-pkginfo
@@ -38,7 +38,7 @@ pkg=$(zpm-findpkg $pkgfile)
 
 #.mode line
 {
-sqlite3 $pkgfile <<-EOS
+zpm shell $pkgfile <<-EOS
 select 
 	printf('Package: %s
 	Version: %s
diff --git a/zpm-sequence b/zpm-sequence
index 768d3f7..db0303d 100755
--- a/zpm-sequence
+++ b/zpm-sequence
@@ -4,11 +4,11 @@ set -e
 
 ZPMSPOOL=${ZPMSPOOL:-/var/lib/admin/notes}
 DB=$ZPMSPOOL/.sequence.db
-SQL="sqlite3 -bail $DB"
+SQL="zpm shell -bail $DB"
 
 #rm -f $DB
 test -f $DB || {
-sqlite3 $DB <<EOS
+zpm shell $DB <<EOS
 create table sequence ( sequence text not null primary key, val integer not null default 0);
 insert into sequence (sequence) values ('default');
 EOS
@@ -53,6 +53,6 @@ esac
 
 seq=${1:-default}
 
-num=$(sqlite3 $DB "begin; update sequence set val = val + 1 where sequence = '$seq'; commit;select val from sequence where sequence = '$seq';")
+num=$(zpm shell $DB "begin; update sequence set val = val + 1 where sequence = '$seq'; commit;select val from sequence where sequence = '$seq';")
 
 echo $num
diff --git a/zpm-showpkg b/zpm-showpkg
index 4bc61ac..f55cb0a 100755
--- a/zpm-showpkg
+++ b/zpm-showpkg
@@ -3,7 +3,7 @@
 {
 for pkgfile in $*; do
 
-	sqlite3 $pkgfile <<EOS
+	zpm shell $pkgfile <<EOS
 .separator "\t"
 select package, version, release, path || case when hash is null then '/' else '' end from packagefiles
 ;
diff --git a/zpm-test b/zpm-test
index 4ed9e85..9f6c876 100755
--- a/zpm-test
+++ b/zpm-test
@@ -20,7 +20,7 @@ for pkgfile in "$@"; do
 		exit 1
 	fi
 
-appid=$(sqlite3 $pkgfile 'pragma application_id;' | ( echo obase = 16; cat - ) | bc)
+appid=$(zpm shell $pkgfile 'pragma application_id;' | ( echo obase = 16; cat - ) | bc)
 if [ "$appid" != "5A504442" ]; then
 	if [ "$verbose" -eq 1 ]; then
 		echo $pkgfile does not appear to be a zpm package file 1>&2