From 9d083a447a46714def83ef782581c51d8e5897dc Mon Sep 17 00:00:00 2001
From: Nathan Wagner <nw@hydaspes.if.org>
Date: Sat, 15 Sep 2018 12:25:09 +0000
Subject: [PATCH] rework zpm-add

---
 zpm-add | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/zpm-add b/zpm-add
index 51c0805..4025bde 100755
--- a/zpm-add
+++ b/zpm-add
@@ -54,15 +54,28 @@ fi
 
 pkgid="$1"
 shift
-set -x
 eval $(zpm parse -E $pkgid)
 
-if [ -z "$pkgfile" ];
+if [ -z "$pkgfile" ]; then
 	pkgfile=$ZPM_PACKAGE_FILE
 fi
 
+if [ -z "$release" ]; then
+	if [ -z "$pkgfile" ]; then
+		die "cannot determine package file"
+	else
+		pkgstr=$(zpm findpkg $pkgfile $pkgid)
+		if [ -z "$pkgstr" ]; then
+			die "unable to find package id for $pkgid in $pkgfile"
+		fi
+		pkgid=$pkgstr
+		# need to reparse the new package id
+		eval $(zpm parse -E $pkgid)
+	fi
+fi
+
 # look for a .zpm file here
-if [ -z "$pkgfile" ] && [ -n "$release" ] && [ -f "$pkgid.zpm" ];
+if [ -z "$pkgfile" ] && [ -f "$pkgid.zpm" ]; then
 	pkgfile="$pkgid.zpm"
 fi
 
@@ -80,14 +93,9 @@ fi
 
 zpm test -v $pkgfile
 
-if [ -z "$release" ]; then
-	pkgstr=$(zpm findpkg -f $pkgfile $pkgid)
-fi
-
-if [ -z "$pkgstr" ]; then
-	die "unable to find package id for $pkgid"
-fi
-pkgid=$pkgstr
+package=$(zpm quote "$name")
+pkgver=$(zpm quote "$version")
+pkgrel=$(zpm quote "$release")
 
 #strip=$(cleanpath "$strip")
 for path in $*; do
@@ -147,6 +155,7 @@ for path in $*; do
 	esac
 
 	# TODO check that we have such a package,version,release
+	#cat <<EOS
 	zpm shell $pkgfile <<EOS
 PRAGMA foreign_keys = ON;
 begin;
-- 
2.40.0