let newpackage set additional fields

[zpackage] / zpm-contents

diff --git a/zpm-contents b/zpm-contents
index ea9e3cdd134a7b84a233ff3d61c05b1916339c13..d466478dd11d2581aee9c86967f4dd4c8e5657b3 100755 (executable)
--- 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))
@@ -39,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
@@ -84,7 +91,7 @@ cols=${cols%,}
                printf "else path end as path\n"
        fi
        printf "from packagefiles_pkgid PF\n"
-       if [ $showsoname -eq 1 ]; then
+       if [ $showsoname -eq 1 ] || [ $sharedlibsonly -eq 1 ]; then
                printf "left join elflibraries EL on EL.file = PF.hash\n"
        fi
        if [ -n "$status" ]; then
@@ -95,16 +102,19 @@ cols=${cols%,}
                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 package,version collate vercmp, release, path\n'
+       printf 'order by PF.package, PF.version collate vercmp, PF.release, PF.path\n'
        printf ';\n'
 } | zpm shell $pkgfile
 #} | cat