rewrite zpm-install

[zpackage] / zpm-contents

diff --git a/zpm-contents b/zpm-contents
index 39b48a779a2f342f88aa121525e45c4976a1f3c8..ff607fbb0b24726e84767aa7d461f347f92bdd4a 100755 (executable)
--- a/zpm-contents
+++ b/zpm-contents
@@ -6,8 +6,10 @@ 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))
@@ -73,9 +77,12 @@ 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_status PF left join elflibraries EL on EL.file = PF.hash\nwhere true\n'
        if [ -n "$globlist" ]; then
                printf "and (%s)\n" "$globlist"
        fi
@@ -86,6 +93,9 @@ cols=${cols%,}
                only) printf "and configuration = 1\n" ;;
                exclude) printf "and configuration = 0\n" ;;
        esac
+       if [ -n "$status" ]; then
+               printf "and status = '%s'\n" "$status"
+       fi
        printf 'order by pkgid,path\n'
        printf ';\n'
 } | zpm shell $pkgfile