X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-contents;h=447e095a1eab9d97dfbf084474a7ee6993fbf83f;hb=f2f54bb7f19a00b8220ad130ff7f2383bae17299;hp=929feabfdb586e050b38603163e607d58b6d6107;hpb=ec7880f0b240eee1f829a23cdecb4bef75644eb6;p=zpackage

diff --git a/zpm-contents b/zpm-contents
index 929feab..447e095 100755
--- a/zpm-contents
+++ b/zpm-contents
@@ -1,13 +1,15 @@
 #!/bin/sh
 
-pkgfile=${ZPMDB:-/var/lib/zpm/db.zpm}
+pkgfile=${ZPMDB:-/var/lib/zpm/local.db}
 
 long=0
 pkgonly=0
 quiet=0
 config=include
+showsoname=0
+status=
 
-while getopts f:qlncC opt; do
+while getopts f:qlncCLI opt; do
 	case $opt in
 		f) pkgfile="$OPTARG" ;;
 		l) long=1 ;;
@@ -15,6 +17,8 @@ while getopts f:qlncC opt; do
 		q) quiet=1 ;;
 		c) config=only ;;
 		C) config=exclude ;;
+		L) showsoname=1 ;;
+		I) status=installed
 	esac
 done
 shift $((OPTIND - 1))
@@ -47,10 +51,15 @@ while [ $# -gt 0 ]; do
 		q=$(zpm quote -q "$pkgid")
 		pkglist=",$q"
 	else
-		warn "package $pkg not found, ignoring"
+		printf "package $pkg not found, ignoring\n" 1>&2
+		exit 1
+	fi
+	pkglist=${pkglist#,}
+	if [ -z "$pkglist" ]; then
+		printf "can't find any packages\n" 1>&2
+		exit 1
 	fi
 done
-pkglist=${pkglist#,}
 
 globlist=
 for glob in "$@"; do
@@ -63,6 +72,7 @@ cols=${cols%,}
 
 {
 	printf '.separator " "\n'
+#	printf '.echo on\n'
 	printf 'select %s\n' "$cols"
 
 	if [ $pkgonly -eq 0 ]; then
@@ -73,9 +83,19 @@ cols=${cols%,}
 		printf "case\n";
 		printf "when filetype = 'd' then rtrim(path,'/') || '/'\n"
 		printf "when filetype = 'l' then printf('%%s -> %%s', path, target)\n"
+		if [ $showsoname -eq 1 ]; then
+			printf "when EL.soname is not null then printf('%%s (%%s)', path, EL.soname)\n"
+		fi
 		printf "else path end as path\n"
 	fi
-	printf 'from packagefiles_pkgid\nwhere true\n'
+	printf "from packagefiles_pkgid PF\n"
+	if [ $showsoname -eq 1 ]; then
+	       	printf "left join elflibraries EL on EL.file = PF.hash\n"
+	fi
+	if [ -n "$status" ]; then
+		printf "join packages P on P.package = PF.package and P.version = PF.version and P.release = PF.release\n"
+	fi
+	printf "where true\n"
 	if [ -n "$globlist" ]; then
 		printf "and (%s)\n" "$globlist"
 	fi
@@ -86,7 +106,10 @@ cols=${cols%,}
 		only) printf "and configuration = 1\n" ;;
 		exclude) printf "and configuration = 0\n" ;;
 	esac
-	printf 'order by pkgid,path\n'
+	if [ -n "$status" ]; then
+		printf "and P.status = '%s'\n" "$status"
+	fi
+	printf 'order by package,version collate vercmp, release, path\n'
 	printf ';\n'
 } | zpm shell $pkgfile
 #} | cat