From 85e16216d4f95a3986ce18d3e5a4a5ed431a4ad5 Mon Sep 17 00:00:00 2001 From: The Linux Kitten Date: Sun, 9 Mar 2014 21:22:02 +0100 Subject: Add support for -v option on OpenBSD The `-v` (verbose) flag for `cp`, `ln`, and `rm` is not standard. It is simple to implement using shell functions, so introduce `cp_v`, `ln_v`, and `rm_v`. These shell functions use the existing `$VERBOSE` variable for printing, which simplifies the code and reduces the number of variables. Fixes #61. --- bin/rcup | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bin/rcup') diff --git a/bin/rcup b/bin/rcup index c1cdc8e..b45157b 100755 --- a/bin/rcup +++ b/bin/rcup @@ -8,7 +8,7 @@ link_or_copy() { local sigil="$1" if [ "x$sigil" = "xX" ]; then - echo "$CP" + echo "cp_v" else echo "$LN" fi @@ -20,7 +20,7 @@ link_file() { local sigil="$3" if [ -h "$dest" ]; then - $RM -f "$dest" + rm_v -f "$dest" fi action="$(link_or_copy "$sigil")" @@ -35,7 +35,7 @@ replace_file() { $DEBUG replace_file "$1" "$2" $3 - $RM -rf "$dest" + rm_v -rf "$dest" link_file "$src" "$dest" "$sigil" } @@ -126,8 +126,9 @@ handle_command_line() { done shift $(($OPTIND-1)) + LN="ln_v" if [ $always_copy -eq 1 ]; then - LN="$CP" + LN="cp_v" fi handle_common_flags rcup $version $verbosity -- cgit v1.2.3