X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-contents;h=ea9e3cdd134a7b84a233ff3d61c05b1916339c13;hb=5405c7c75dc410d93818fabdfa290dbaa4505aac;hp=6cdd485d4562397bb10baffac3334fe5d156c40a;hpb=4fc7036e52b8a250dbcfe1d472db52d9bc153cbb;p=zpackage

diff --git a/zpm-contents b/zpm-contents
index 6cdd485..ea9e3cd 100755
--- a/zpm-contents
+++ b/zpm-contents
@@ -7,8 +7,9 @@ pkgonly=0
 quiet=0
 config=include
 showsoname=0
+status=
 
-while getopts f:qlncCL opt; do
+while getopts f:qlncCLI opt; do
 	case $opt in
 		f) pkgfile="$OPTARG" ;;
 		l) long=1 ;;
@@ -17,6 +18,7 @@ while getopts f:qlncCL opt; do
 		c) config=only ;;
 		C) config=exclude ;;
 		L) showsoname=1 ;;
+		I) status=installed
 	esac
 done
 shift $((OPTIND - 1))
@@ -65,6 +67,7 @@ cols=${cols%,}
 
 {
 	printf '.separator " "\n'
+#	printf '.echo on\n'
 	printf 'select %s\n' "$cols"
 
 	if [ $pkgonly -eq 0 ]; then
@@ -80,7 +83,14 @@ cols=${cols%,}
 		fi
 		printf "else path end as path\n"
 	fi
-	printf 'from packagefiles_pkgid PF left join elflibraries EL on EL.file = PF.hash\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
@@ -91,7 +101,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