X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;ds=sidebyside;f=zpm-addtopackage;h=19db69baf815782966b84c7239aa1b17f5317489;hb=4df07927ce9cf9257c974c571a7e04d4fa7c2cbe;hp=3833c00502a752bd76f013434b0f06609d6c4f61;hpb=ecdd57da7df775c039aee834e1f74172004f352b;p=zpackage

diff --git a/zpm-addtopackage b/zpm-addtopackage
index 3833c00..19db69b 100755
--- a/zpm-addtopackage
+++ b/zpm-addtopackage
@@ -2,8 +2,8 @@
 
 package=${1:-$ZPMPACKAGE}
 shift
-pkgver=${ZPMPACKAGEVER:-1.0}
-pkgrel=${ZPMPACKAGEREL:-1}
+pkgver=${ZPMPKGVER:-1.0}
+pkgrel=${ZPMPKGREL:-1}
 
 # option for "multipackage" just to let the system know that's what you meant
 # option to take filenames from stdin
@@ -29,7 +29,7 @@ if [ -z "$pkgfile" ]; then
 fi
 
 if [ ! -f $pkgfile ]; then
-	./zpm-newpackage $package || exit 1
+	zpm newpackage $package || exit 1
 else
 	appid=$(sqlite3 $pkgfile 'pragma application_id;' | ( echo obase = 16; cat - ) | bc)
 	if [ "$appid" != "5A504442" ]; then
@@ -39,12 +39,12 @@ else
 fi
 
 for path in $*; do
-	mtime=$(stat -c '%Y' $path)
-	uid=$(stat -c '%u' $path)
-	gid=$(stat -c '%g' $path)
-	username=$(stat -c '%U' $path)
-	groupname=$(stat -c '%G' $path)
-	mode=$(stat -c '%a' $path)
+	mtime=$(zpm stat -t '%y' $path)
+	uid=$(zpm stat -t '%u' $path)
+	gid=$(zpm stat -t '%g' $path)
+	username=$(zpm stat -t '%U' $path)
+	groupname=$(zpm stat -t '%G' $path)
+	mode=$(zpm stat -t '%a' $path)
 
 	# strip off leading slashes
 	rpath=$(echo "$path" | sed -e 's|^/*||')
@@ -64,7 +64,7 @@ for path in $*; do
 
 	if [ -f "$path" ]; then
 
-		hash=$(./zpm-addfile $pkgfile $path)
+		hash=$(zpm addfile $pkgfile $path)
 
 #if [ -z "$hash" ]; then continue; fi