X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=zpm-contents;h=d466478dd11d2581aee9c86967f4dd4c8e5657b3;hp=d6a5996ba34846945b7db0b68074f0314e88b84a;hb=62f6ff407bc4f2cf03d1fa7cf3dc9a3f4026624a;hpb=62e2d81f8e5c1a2284660752524753638ae59766

diff --git a/zpm-contents b/zpm-contents
index d6a5996..d466478 100755
--- a/zpm-contents
+++ b/zpm-contents
@@ -1,17 +1,26 @@
 #!/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=
+sharedlibsonly=0
 
-while getopts f:qln opt; do
+while getopts f:qlncCLIs opt; do
 	case $opt in
 		f) pkgfile="$OPTARG" ;;
 		l) long=1 ;;
 		n) pkgonly=1 ;;
 		q) quiet=1 ;;
+		c) config=only ;;
+		C) config=exclude ;;
+		L) showsoname=1 ;;
+		s) sharedlibsonly=1 ;;
+		I) status=installed ;;
 	esac
 done
 shift $((OPTIND - 1))
@@ -32,22 +41,27 @@ elif [ $quiet -eq 0 ]; then
 fi
 
 pkglist=
+efail=0
 while [ $# -gt 0 ]; do
 	pkg=$1
 	shift
-	if [ "$pkg" = '--' ]; then
-		break;
+
+	if [ "$pkg" = ':' ]; then
+		break
 	fi
 
 	pkgid=$(zpm findpkg -f $pkgfile "$pkg")
 	if [ -n "$pkgid" ]; then
-		q=$(zpm quote -q "$pkgid")
-		pkglist=",$q"
+		pkglist="$pkglist $pkgid"
 	else
-		warn "package $pkg not found, ignoring"
+		printf "package $pkg not found\n" 1>&2
+		efail=1
 	fi
 done
-pkglist=${pkglist#,}
+
+if [ $efail -eq 1 ]; then
+	exit 1;
+fi
 
 globlist=
 for glob in "$@"; do
@@ -60,6 +74,7 @@ cols=${cols%,}
 
 {
 	printf '.separator " "\n'
+#	printf '.echo on\n'
 	printf 'select %s\n' "$cols"
 
 	if [ $pkgonly -eq 0 ]; then
@@ -67,24 +82,39 @@ cols=${cols%,}
 			printf ', '
 		fi
 
-		cat <<-EOC
-		case when filetype = 'd' then
-			rtrim(path,'/') || '/'
-		when filetype = 'l' then
-			printf('%s -> %s', path, target)
-		else
-			path
-		end as path
-		EOC
+		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 PF\n"
+	if [ $showsoname -eq 1 ] || [ $sharedlibsonly -eq 1 ]; then
+	       	printf "left join elflibraries EL on EL.file = PF.hash\n"
 	fi
-	printf 'from packagefiles_pkgid\nwhere true\n'
+	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
 	if [ -n "$pkglist" ]; then
-		printf "and pkgid in (%s)\n" "$pkglist"
+		printf "and pkgid in (%s)\n" "$(zpm quote -d, -q $pkglist)"
+	fi
+	case $config in
+		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 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