increase syncfs dry-run verbosity

[zpackage] / zpm-contents

diff --git a/zpm-contents b/zpm-contents
index 7522c183a647f0f8f9ab34647963e3954e2021db..6bc470e51e9c59fa0c74cae9657ac20de8c48fd6 100755 (executable)
--- a/zpm-contents
+++ b/zpm-contents
@@ -5,13 +5,16 @@ pkgfile=${ZPMDB:-/var/lib/zpm/db.zpm}
 long=0
 pkgonly=0
 quiet=0
+config=include
 
-while getopts f:qln opt; do
+while getopts f:qlncC opt; do
        case $opt in
                f) pkgfile="$OPTARG" ;;
                l) long=1 ;;
                n) pkgonly=1 ;;
                q) quiet=1 ;;
+               c) config=only ;;
+               C) config=exclude ;;
        esac
 done
 shift $((OPTIND - 1))
@@ -22,7 +25,7 @@ if [ ! -f $pkgfile ]; then
 fi
 
 if [ $long -gt 0 ]; then
-       cols="filetype,printf('%3.3s', mode) as mode,username,groupname,"
+       cols="filetype,printf('%.4s', mode) as mode,username,groupname,"
 fi
 
 if [ $pkgonly -eq 1 ]; then
@@ -67,13 +70,10 @@ cols=${cols%,}
                        printf ', '
                fi
 
-               cat <<-EOC
-               case when filetype = 'd' then
-                       rtrim(path,'/') || '/'
-               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"
+               printf "else path end as path\n"
        fi
        printf 'from packagefiles_pkgid\nwhere true\n'
        if [ -n "$globlist" ]; then
@@ -82,6 +82,10 @@ cols=${cols%,}
        if [ -n "$pkglist" ]; then
                printf "and pkgid in (%s)\n" "$pkglist"
        fi
+       case $config in
+               only) printf "and configuration = 1\n" ;;
+               exclude) printf "and configuration = 0\n" ;;
+       esac
        printf 'order by pkgid,path\n'
        printf ';\n'
 } | zpm shell $pkgfile