use zpm shell instead of sqlite3

diff --git a/zpm-addtopackage b/zpm-addtopackage
index 9c66169547a7d31a4a6812cd789473ebc59a304e..a2e5aeec4c86c3a25c811b31b585d2c7010b4651 100755 (executable)
--- a/zpm-addtopackage
+++ b/zpm-addtopackage
@@ -120,7 +120,7 @@ for path in $*; do
                        ;;
        esac
 
                        ;;
        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)
 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 bf4be1d0428d9347aa413a0adf850065db8d0247..5d49be50de6b7833df486231d65b13ea4bbcf2bd 100755 (executable)
--- a/zpm-fileinfo
+++ b/zpm-fileinfo
@@ -32,10 +32,10 @@ if [ -z "$pkgfile" ]; then
        pkgfile="$package-$pkgver-$pkgrel.zpm"
 fi
 
        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
 ;
 .mode line
 select * from packages where package = '$package' and version = '$pkgver' and release = $pkgrel
 ;

diff --git a/zpm-install b/zpm-install
index 8d259c0be2ad9d4d40a9a2759e209b261d238545..be851acf905259657a0ca500c385daa30f838795 100755 (executable)
--- a/zpm-install
+++ b/zpm-install
@@ -73,7 +73,7 @@ else
 fi
 
 pathlist() {
 fi
 
 pathlist() {

-       sqlite3 $pkgfile<<EOS
+       zpm shell $pkgfile<<EOS

 select path from packagefiles
        where package||'-'||version||'-'||release = '$pkg'
        ;
 select path from packagefiles
        where package||'-'||version||'-'||release = '$pkg'
        ;

diff --git a/zpm-ipkgfile b/zpm-ipkgfile
index 04f980e25b4939df135f5e088c1b14fc8203e481..0de0397b31f9073139697f0b4ea3c3220e70dc26 100755 (executable)
--- a/zpm-ipkgfile
+++ b/zpm-ipkgfile
@@ -25,7 +25,7 @@ die() {
 }
 
 pkgfileinfo() {
 }
 
 pkgfileinfo() {

-       sqlite3 $pkgfile<<EOS
+       zpm shell $pkgfile<<EOS

 select $1 from packagefiles
        where path='$2'
        and package||'-'||version||'-'||release = '$pkg'
 select $1 from packagefiles
        where path='$2'
        and package||'-'||version||'-'||release = '$pkg'

diff --git a/zpm-newpackage b/zpm-newpackage
index 3afabb60a47d23fb68e1cbaa7a9976e42a7c6769..31d1b9826ed1b1defa1b7bfb7f2c30d85924cae9 100755 (executable)
--- a/zpm-newpackage
+++ b/zpm-newpackage
@@ -47,7 +47,7 @@ if [ "$idempotent" = 1 ]; then
        idempotent='or ignore'
 fi
 
        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)
 ;
 insert $idempotent into packages ("package", "version", "release", "build_time")
 values ('$package', '$pkgver', $pkgrel, $builddate)
 ;

diff --git a/zpm-pkg b/zpm-pkg
index 30630d3116149cc68af24df8d5a16a6b07f78d17..67f9eb11e968732b99ee2f7b030a9ec4d8044999 100755 (executable)
--- a/zpm-pkg
+++ b/zpm-pkg
@@ -27,9 +27,9 @@ if [ ! -f $pkgfile ]; then
 fi
 
 for path in $*; do
 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)
 ;
 insert into packagefiles
 values ('$package', nullif('$subpackage', ''), '$hash', '$path', NULL)
 ;

diff --git a/zpm-pkginfo b/zpm-pkginfo
index bf735c7801d19a300d502a21adcf8425aed16c69..3be0e03afc31389643de272ccd6f7235034bf392 100755 (executable)
--- a/zpm-pkginfo
+++ b/zpm-pkginfo
@@ -38,7 +38,7 @@ pkg=$(zpm-findpkg $pkgfile)
 
 #.mode line
 {
 
 #.mode line
 {

-sqlite3 $pkgfile <<-EOS
+zpm shell $pkgfile <<-EOS

 select 
        printf('Package: %s
        Version: %s
 select 
        printf('Package: %s
        Version: %s

diff --git a/zpm-sequence b/zpm-sequence
index 768d3f786ca8db7997bdc69e87fa2b214fd62d8b..db0303df71a75e28e86ebf336664a1ffcc75bc1f 100755 (executable)
--- a/zpm-sequence
+++ b/zpm-sequence
@@ -4,11 +4,11 @@ set -e
 
 ZPMSPOOL=${ZPMSPOOL:-/var/lib/admin/notes}
 DB=$ZPMSPOOL/.sequence.db
 
 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 || {
 
 #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
 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}
 
 
 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
 
 echo $num

diff --git a/zpm-showpkg b/zpm-showpkg
index 4bc61ac4b9fe4cf5edbe460516fdd38b4c49f0f0..f55cb0ac5483a139881d6e986abb8507d939c29b 100755 (executable)
--- a/zpm-showpkg
+++ b/zpm-showpkg
@@ -3,7 +3,7 @@
 {
 for pkgfile in $*; do
 
 {
 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
 ;
 .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 4ed9e85b2e2f2c9d8393c10dde79f0936339dfbe..9f6c8767e0b1c6460804cd403a8c5a412bd6b9f5 100755 (executable)
--- a/zpm-test
+++ b/zpm-test
@@ -20,7 +20,7 @@ for pkgfile in "$@"; do
                exit 1
        fi
 
                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
 if [ "$appid" != "5A504442" ]; then
        if [ "$verbose" -eq 1 ]; then
                echo $pkgfile does not appear to be a zpm package file 1>&2