add -f pkgfile option to addtopackage

[zpackage] / zpm-newpackage

diff --git a/zpm-newpackage b/zpm-newpackage
index fbd44b5afc41c298ff3273f42e87551ff6a17687..8cce97db78f323dbb7ead66849cee583d7808e6b 100755 (executable)
--- a/zpm-newpackage
+++ b/zpm-newpackage
@@ -1,12 +1,11 @@
 #!/bin/sh
 
-package=${1:-$ZPMPACKAGE}
-pkgver=${ZPMPACKAGEVER:-1.0}
-pkgrel=${ZPMPACKAGEREL:-1}
+pkgver=${ZPMPKGVER:-1.0}
+pkgrel=${ZPMPKGREL:-1}
 
 builddate=$(date '+%s')
 
-while getopts :f:v:r:d:a:u:l:p:b: opt; do
+while getopts :f:v:r:d:a:u:l:p:b:I opt; do
        case $opt in
                f) pkgfile="$OPTARG" ;;
                v) pkgver="$OPTARG" ;;
@@ -17,21 +16,39 @@ while getopts :f:v:r:d:a:u:l:p:b: opt; do
                l) licenses="$OPTARG" ;;
                p) packager="$OPTARG" ;;
                b) builddate="$OPTARG" ;;
+               I) idempotent=1
        esac
 done
+shift $(( OPTIND - 1))
 
-set -e
+die() {
+       echo $* 1&>2
+       exit 1
+}
+
+package=$1
+shift
+
+if [ -z "$package" ]; then
+       die "must specify package"
+fi
 
 if [ -z "$pkgfile" ]; then
        pkgfile="$package-$pkgver-$pkgrel.zpm"
 fi
 
+set -e
+
 if [ ! -e $pkgfile ]; then
-       sqlite3 $pkgfile < db.sql
+       zpm init $pkgfile
+fi
+
+if [ "$idempotent" = 1 ]; then
+       idempotent='or ignore'
 fi
 
 sqlite3 $pkgfile <<EOS
-insert or ignore into packages ("package", "version", "release", "build_time")
+insert $idempotent into packages ("package", "version", "release", "build_time")
 values ('$package', '$pkgver', $pkgrel, $builddate)
 ;
 EOS