X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-contents;h=18fac9443dc45360dbb947f89c7bfcf40042c12f;hb=f028f36e65af8c715317a37ac21e1a1e1b0e9b2a;hp=ff607fbb0b24726e84767aa7d461f347f92bdd4a;hpb=ae7d62320daeda36f7e5d5577b7752230dd6f50b;p=zpackage

diff --git a/zpm-contents b/zpm-contents
index ff607fb..18fac94 100755
--- a/zpm-contents
+++ b/zpm-contents
@@ -8,8 +8,9 @@ quiet=0
 config=include
 showsoname=0
 status=
+sharedlibsonly=0
 
-while getopts f:qlncCLI opt; do
+while getopts f:qlncCLIs opt; do
 	case $opt in
 		f) pkgfile="$OPTARG" ;;
 		l) long=1 ;;
@@ -18,7 +19,8 @@ while getopts f:qlncCLI opt; do
 		c) config=only ;;
 		C) config=exclude ;;
 		L) showsoname=1 ;;
-		I) status=installed
+		s) sharedlibsonly=1 ;;
+		I) status=installed ;;
 	esac
 done
 shift $((OPTIND - 1))
@@ -51,10 +53,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
@@ -67,6 +74,7 @@ cols=${cols%,}
 
 {
 	printf '.separator " "\n'
+#	printf '.echo on\n'
 	printf 'select %s\n' "$cols"
 
 	if [ $pkgonly -eq 0 ]; then
@@ -82,7 +90,14 @@ cols=${cols%,}
 		fi
 		printf "else path end as path\n"
 	fi
-	printf 'from packagefiles_status PF left join elflibraries EL on EL.file = PF.hash\nwhere true\n'
+	printf "from packagefiles_pkgid PF\n"
+	if [ $showsoname -eq 1 ] || [ $sharedlibsonly -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
@@ -93,10 +108,13 @@ cols=${cols%,}
 		only) printf "and configuration = 1\n" ;;
 		exclude) printf "and configuration = 0\n" ;;
 	esac
+	if [ $sharedlibsonly -eq 1 ]; then
+		printf "and EL.soname is not null\n"
+	fi
 	if [ -n "$status" ]; then
-		printf "and status = '%s'\n" "$status"
+		printf "and P.status = '%s'\n" "$status"
 	fi
-	printf 'order by pkgid,path\n'
+	printf 'order by PF.package, PF.version collate vercmp, PF.release, PF.path\n'
 	printf ';\n'
 } | zpm shell $pkgfile
 #} | cat