X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-contents;h=7522c183a647f0f8f9ab34647963e3954e2021db;hb=f657628fd0709886002fdb0e2d8bde6873a34eb8;hp=0d1a027bae73110f937b3dec01151331bd63eaf2;hpb=be0c6a3ddf95ba9694763324509e58eb48199ae6;p=zpackage

diff --git a/zpm-contents b/zpm-contents
index 0d1a027..7522c18 100755
--- a/zpm-contents
+++ b/zpm-contents
@@ -2,31 +2,87 @@
 
 pkgfile=${ZPMDB:-/var/lib/zpm/db.zpm}
 
-while getopts f: opt; do
+long=0
+pkgonly=0
+quiet=0
+
+while getopts f:qln opt; do
 	case $opt in
 		f) pkgfile="$OPTARG" ;;
+		l) long=1 ;;
+		n) pkgonly=1 ;;
+		q) quiet=1 ;;
 	esac
 done
 shift $((OPTIND - 1))
 
-set -e
-
 if [ ! -f $pkgfile ]; then
 	echo cannot find $pkgfile
 	exit 1
 fi
 
+if [ $long -gt 0 ]; then
+	cols="filetype,printf('%3.3s', mode) as mode,username,groupname,"
+fi
+
+if [ $pkgonly -eq 1 ]; then
+	cols="pkgid"
+elif [ $quiet -eq 0 ]; then
+	cols="pkgid,$cols"
+fi
 
-for pkg in "$@"; do
-	pkgid=$(zpm findpkg $pkgfile $pkg)
+pkglist=
+while [ $# -gt 0 ]; do
+	pkg=$1
+	shift
+	if [ "$pkg" = '--' ]; then
+		break;
+	fi
 
-	zpm shell $pkgfile <<EOS
-.separator "\t"
-select package, version, release,
-path || case when hash is null then '/' else '' end
-from packagefiles
-where printf('%s-%s-%s', package,version,release) = '$pkgid'
-;
-EOS
+	pkgid=$(zpm findpkg -f $pkgfile "$pkg")
+	if [ -n "$pkgid" ]; then
+		q=$(zpm quote -q "$pkgid")
+		pkglist=",$q"
+	else
+		warn "package $pkg not found, ignoring"
+	fi
+done
+pkglist=${pkglist#,}
 
+globlist=
+for glob in "$@"; do
+	q=$(zpm quote -q "$glob")
+	globlist="or path glob $q"
 done
+globlist=${globlist#'or '}
+
+cols=${cols%,}
+
+{
+	printf '.separator " "\n'
+	printf 'select %s\n' "$cols"
+
+	if [ $pkgonly -eq 0 ]; then
+		if [ -n "$cols" ]; then
+			printf ', '
+		fi
+
+		cat <<-EOC
+		case when filetype = 'd' then
+			rtrim(path,'/') || '/'
+		else
+			path
+		end as path
+		EOC
+	fi
+	printf 'from packagefiles_pkgid\nwhere true\n'
+	if [ -n "$globlist" ]; then
+		printf "and (%s)\n" "$globlist"
+	fi
+	if [ -n "$pkglist" ]; then
+		printf "and pkgid in (%s)\n" "$pkglist"
+	fi
+	printf 'order by pkgid,path\n'
+	printf ';\n'
+} | zpm shell $pkgfile
+#} | cat