X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-add;h=68c986dbfc05a365a3dadce4c2804296efd683fe;hb=fc0e2fbaf7051e42be1a6449a5a004fb3e665d45;hp=7de51e9eb9f5322d135bcb85af375129bef79552;hpb=e41a09e93fc1d4aed061a6aa7a0755fb21092fe3;p=zpackage diff --git a/zpm-add b/zpm-add index 7de51e9..68c986d 100755 --- a/zpm-add +++ b/zpm-add @@ -34,6 +34,7 @@ tags= isconfig=0 addcontent=1 complete=0 +mode= # 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 @@ -48,7 +49,8 @@ while getopts :f:vr:l:P:S:cu:g:NC opt; do c) isconfig=1 ;; u) username="$OPTARG" ;; g) groupname="$OPTARG" ;; - v) verbose=1 ;; + m) mode="$OPTARG" ;; + v) verbose=$((verbose + 1)) ;; C) complete=1 ;; *) echo 'unknown option' $OPTARG; exit 1 ;; esac @@ -59,7 +61,7 @@ if [ $isconfig -eq 1 ]; then tags="$tags configuration" fi -if [ $verbose -gt 1 ]; then +if [ $verbose -gt 2 ]; then set -x fi @@ -118,9 +120,16 @@ for path in $*; do mtime=$(zpm stat -f '%y' $path) uid=$(zpm stat -f '%u' $path) gid=$(zpm stat -f '%g' $path) + + if [ -z "$mode" ]; then + mode=$(zpm stat -f '%a' $path) + fi + + # only stat the file for the user and group name if not set on the + # command line : ${username:=$(zpm stat -f '%U' $path)} : ${groupname:=$(zpm stat -f '%G' $path)} - mode=$(zpm stat -f '%a' $path) + rpath="$path" rpath=$(cleanpath "$path") @@ -133,7 +142,6 @@ for path in $*; do fi if [ ! -z "$strip" ]; then - echo "stripping $strip" rpath=${rpath#$strip} rpath=${rpath#/} fi @@ -147,6 +155,9 @@ for path in $*; do rpath="$prefix/$rpath" fi + # ensure all paths are absolute + rpath=/${rpath#/} + filetype=$(zpm stat -l -f '%t' "$path") hash='NULL' target='NULL' @@ -177,13 +188,15 @@ for path in $*; do #cat < $target"} -if [ $verbose -gt 0 ]; then +if [ $verbose -gt 1 ]; then + printf "%s%s %s:%s %s\n" $filetype $mode $username $groupname $path +elif [ $verbose -gt 0 ]; then printf "%s\n" $path fi