change findpkg to use -f option

[zpackage] / zpm-add

diff --git a/zpm-add b/zpm-add
index 5d84d543e294323aa73305bcbaf9b958648e31ca..1d68800a9c2faf5d68befb55620a393f47340142 100755 (executable)
--- a/zpm-add
+++ b/zpm-add
@@ -35,6 +35,7 @@ isconfig=0
 # option for "multipackage" just to let the system know that's what you meant
 # option to take filenames from stdin
 # parse package, version, release from file if not given
+# TODO -l follow symlinks, -L follow symlinks, adding all, links and targets
 while getopts :f:vr:l:P:S:cu:g: opt; do
        case $opt in
                f) pkgfile="$OPTARG" ;;
@@ -70,7 +71,7 @@ if [ -z "$release" ]; then
        if [ -z "$pkgfile" ]; then
                die "cannot determine package file"
        else
-               pkgstr=$(zpm findpkg $pkgfile $pkgid)
+               pkgstr=$(zpm findpkg -f $pkgfile $pkgid)
                if [ -z "$pkgstr" ]; then
                        die "unable to find package id for $pkgid in $pkgfile"
                fi
@@ -142,7 +143,7 @@ for path in $*; do
                rpath="$prefix/$rpath"
        fi
 
-       filetype=$(zpm stat -f '%t' "$path")
+       filetype=$(zpm stat -l -f '%t' "$path")
        hash='NULL'
        target='NULL'
        case "$filetype" in
@@ -175,5 +176,8 @@ commit;
 EOS
 
 #printf "%s %s%s\n" $path $rpath ${target:+" -> $target"}
-printf "%s\n" $path
+if [ $verbose -gt 0 ]; then
+       printf "%s\n" $path
+fi
+
 done