From: Nathan Wagner <nw@hydaspes.if.org>
Date: Fri, 14 Sep 2018 04:45:47 +0000 (+0000)
Subject: fix pkginfo and list files in package
X-Git-Tag: v0.1.6~50
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=7559402893974753ef273ac7a462c39d06af78d9

fix pkginfo and list files in package
---

diff --git a/zpm-pkginfo b/zpm-pkginfo
index 3be0e03..daef642 100755
--- a/zpm-pkginfo
+++ b/zpm-pkginfo
@@ -62,24 +62,26 @@ EOS
 
 #mode user group hash mtime csvtags path
 
-sqlite3 $pkgfile <<-EOS
-.header on
+zpm shell $pkgfile <<-EOS
+.header off
 select
-	printf('%s %s %s %s %s %s',
+	printf('%s %s %s %s %s %s %s',
 	F.mode, F.username, F.groupname,
 	case when F.filetype = 'c' then
 	       	F.devmajor || ',' || F.devminor
+	when F.filetype = 'd' then
+		'directory'
 	else
 		F.hash
 	end 
 	,strftime('%Y-%m-%dT%H:%M:%S', F.mtime, 'unixepoch')
-	, T.tags
+	, coalesce(T.tags, '-')
 	,F.path)
 from packagefiles as F
 left join (
 	select TG.package, TG.version, TG.release, TG.path
-	,coalesce(group_concat(tag), '-') as tags
-	from packagefiletags TG
+	,group_concat(tag) as tags
+	from pathtags TG
 	group by package, version, release, path
 ) T
 on T.package = F.package and T.version = F.version and T.release = F.release