From 5c7cd8dce1e3f60f4fbaeace7343468c9f7984f3 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Sat, 20 Oct 2018 02:50:34 +0000 Subject: [PATCH] add second verbose level to zpm-add --- zpm-add | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/zpm-add b/zpm-add index 7de51e9..4eb11af 100755 --- a/zpm-add +++ b/zpm-add @@ -48,7 +48,7 @@ while getopts :f:vr:l:P:S:cu:g:NC opt; do c) isconfig=1 ;; u) username="$OPTARG" ;; g) groupname="$OPTARG" ;; - v) verbose=1 ;; + v) verbose=$((verbose + 1)) ;; C) complete=1 ;; *) echo 'unknown option' $OPTARG; exit 1 ;; esac @@ -59,7 +59,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 +118,13 @@ for path in $*; do mtime=$(zpm stat -f '%y' $path) uid=$(zpm stat -f '%u' $path) gid=$(zpm stat -f '%g' $path) + mode=$(zpm stat -f '%a' $path) + + # 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") @@ -183,7 +187,9 @@ commit; EOS #printf "%s %s%s\n" $path $rpath ${target:+" -> $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 -- 2.40.0