use new environment variables

[zpackage] / zpm-newpackage

diff --git a/zpm-newpackage b/zpm-newpackage
index fbd44b5afc41c298ff3273f42e87551ff6a17687..2b947015c47e60d852aedd432edb2d480fbe6ff4 100755 (executable)
--- a/zpm-newpackage
+++ b/zpm-newpackage
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 package=${1:-$ZPMPACKAGE}
-pkgver=${ZPMPACKAGEVER:-1.0}
-pkgrel=${ZPMPACKAGEREL:-1}
+pkgver=${ZPMPKGVER:-1.0}
+pkgrel=${ZPMPKGREL:-1}
 
 builddate=$(date '+%s')
 
@@ -20,14 +20,14 @@ while getopts :f:v:r:d:a:u:l:p:b: opt; do
        esac
 done
 
-set -e
-
 if [ -z "$pkgfile" ]; then
        pkgfile="$package-$pkgver-$pkgrel.zpm"
 fi
 
+set -e
+
 if [ ! -e $pkgfile ]; then
-       sqlite3 $pkgfile < db.sql
+       zpm init $pkgfile
 fi
 
 sqlite3 $pkgfile <<EOS