integrate previous work

[zpackage] / zpm-newpackage

diff --git a/zpm-newpackage b/zpm-newpackage
index 2b947015c47e60d852aedd432edb2d480fbe6ff4..3afabb60a47d23fb68e1cbaa7a9976e42a7c6769 100755 (executable)
--- a/zpm-newpackage
+++ b/zpm-newpackage
@@ -1,12 +1,11 @@
 #!/bin/sh
 
-package=${1:-$ZPMPACKAGE}
 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,8 +16,22 @@ 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))
+
+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"
@@ -30,8 +43,12 @@ if [ ! -e $pkgfile ]; then
        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