Bruce/bin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganised who verbose option is handled

Browse Source
This commit is contained in:
Robert Rothenberg 2011-03-17 13:36:28 +00:00
parent 588de03313
commit deaf3beea9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
trash
View File

@ -15,7 +15,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
version="0.3.0 \$Id: trash 2011/03/17 10:01:16 GMT rr@dwaible $" version="0.3.1 \$Id: trash 2011/03/17 13:34:24 GMT rr@dwaible $"
function show_usage { function show_usage {
cat << EOU cat << EOU
@ -44,13 +44,13 @@ fi
set -- $options set -- $options
verbose="" verbose=0
while [ $# -gt 0 ] while [ $# -gt 0 ]
do do
case $1 in case $1 in
-h|--help) show_usage ; exit 1;; -h|--help) show_usage ; exit 1;;
-v|--verbose) verbose="-v" ;; -v|--verbose) verbose=1 ;;
--version) echo "$0 $version" 1>&2;; --version) echo "$0 $version" 1>&2;;
(--) shift; break;; (--) shift; break;;
(-*) echo "$0: error - unrecognized option $1" 1>&2; exit 1;; (-*) echo "$0: error - unrecognized option $1" 1>&2; exit 1;;
@ -137,6 +137,14 @@ function get_trashdir {
echo $trashdir echo $trashdir
} }
# configure options
mv_opts=""
if [ $verbose != 0 ]; then
mv_opts="${mv_opts} -v"
fi
for f in "$@" for f in "$@"
do do
# strip quotes added by getopts # strip quotes added by getopts
@ -188,7 +196,7 @@ Path=$canon
DeletionDate=`date +"%FT%H:%M:%S"` DeletionDate=`date +"%FT%H:%M:%S"`
END END
mv $verbose "$filename" "$deletedfile" mv $mv_opts "$filename" "$deletedfile"
done done
exit 0 exit 0