X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=zpm-sequence;h=db0303df71a75e28e86ebf336664a1ffcc75bc1f;hp=7abe18cfb90d6445546c06e05d181590169862d8;hb=09c80a1f8918d888063f4d1a75921a99fe5f0b5c;hpb=524ff12aea11e3aa31608f042a823d2bdd1163c1

diff --git a/zpm-sequence b/zpm-sequence
index 7abe18c..db0303d 100755
--- a/zpm-sequence
+++ b/zpm-sequence
@@ -2,28 +2,36 @@
 
 set -e
 
-SPOOL=/var/spool/admin/notes
-DB=$SPOOL/.sequence.db
-SQL="sqlite3 $DB"
+ZPMSPOOL=${ZPMSPOOL:-/var/lib/admin/notes}
+DB=$ZPMSPOOL/.sequence.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
 }
 
+# -c create named sequence
+# -d delete named sequence
+# -v current value
+# -l list all
+# -s set value
+# -n next (optional)
+# -p prepare db, but do nothing
 case $1 in
 	-c)
-		$SQL "insert into sequence (sequence) values ('$2')"
+		$SQL "insert into sequence (sequence) values ('${2:-default}')"
 		exit 0
 		;;
 	-d)
-		$SQL "delete from sequence where sequence = '$2'"
+		$SQL "delete from sequence where sequence = '${2:-default}'"
 		exit 0
 		;;
 	-v)
-		val=$($SQL "select val from sequence where sequence = '$2'")
+		val=$($SQL "select val from sequence where sequence = '${2:-default}'")
 		echo $val
 		exit 0
 		;;
@@ -32,16 +40,19 @@ case $1 in
 		exit 0
 		;;
 	-s)
-		$SQL "begin;update sequence set val = $3 where sequence = '$seq'; commit;"
+		$SQL "begin;update sequence set val = $2 where sequence = '${3:-default}'; commit;"
 		exit 0
 		;;
 	-n)
 		shift
 		;;
+	-p)
+		exit 0
+		;;
 esac
 
-seq=$1
+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