[pacman-dev] [PATCH v2 5/9] pacdiff: rework search type handling, add --find option

[Allan McRae]

On 23/07/13 11:22, Jonathan Frazier wrote:
> change cmd tests to if (( FIND ))... as it is cleaner.  All search cmds
> have an option and a variable initialized to zero. the active option
> should be set to 1.  Add a switch to exclude multiple search options.
> set the default when all are equal to zero.
> 
> Signed-off-by: Jonathan Frazier <eyeswide at gmail.com>
> ---
>  contrib/pacdiff.sh.in | 33 ++++++++++++++++++++++-----------
>  1 file changed, 22 insertions(+), 11 deletions(-)
> 
> diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in
> index b42f68c..f106c17 100644
> --- a/contrib/pacdiff.sh.in
> +++ b/contrib/pacdiff.sh.in
> @@ -23,9 +23,9 @@ declare -r myver='@PACKAGE_VERSION@'
>  
>  diffprog=${DIFFPROG:-vimdiff}
>  diffsearchpath=${DIFFSEARCHPATH:-/etc}
> -locate=0
>  USE_COLOR='y'
>  declare -a oldsaves
> +declare -i FIND=0 LOCATE=0

I changed these on my working branch to USE_FIND and USE_LOCATE as that
is less likely to clash with environmental variables.

>  m4_include(../scripts/library/output_format.sh)
>  
> @@ -33,10 +33,13 @@ usage() {
>  	cat <<EOF
>  $myname is a simple pacnew/pacorig/pacsave updater.
>  
> -Usage: $myname [-l]
> +Usage: $myname [-l | -f] [--nocolor]
>  
> -Options:
> -  -l/--locate       scan using locate (default: find)
> +Search Options:     select one, default: find
> +  -l/--locate       scan using locate
> +  -f/--find         scan using find
> +
> +General Options:
>    --nocolor         remove colors from output
>  
>  Enviroment Variables:
> @@ -56,9 +59,9 @@ version() {
>  }
>  
>  cmd() {
> -	if [ $locate -eq 1 ]; then
> +	if (( LOCATE )); then
>  		locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave '*.pacsave.[0-9]*'
> -	else
> +	elif (( FIND )); then
>  		find $diffsearchpath \( -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave -o -name '*.pacsave.[0-9]*' \) -print0
>  	fi
>  }
> @@ -66,21 +69,29 @@ cmd() {
>  while [[ -n "$1" ]]; do	
>  	case "$1" in
>  		-l|--locate)
> -		locate=1;;
> +			LOCATE=1;;
> +		-f|--find)
> +			FIND=1;;
>  		--nocolor)
> -		USE_COLOR='n' ;;
> +			USE_COLOR='n' ;;
>  		-V|--version)
> -		version; exit 0;;
> +			version; exit 0;;
>  		-h|--help)
> -		usage; exit 0;;
> +			usage; exit 0;;
>  		*)
> -		usage; exit 1;;
> +			usage; exit 1;;
>  	esac
>  	shift
>  done
>  
>  m4_include(../scripts/library/term_colors.sh)
>  
> +case $(( FIND+LOCATE )) in
> +	0) FIND=1;; # set the default search option
> +	[^1]) error "Only one search option may be used at a time"
> +	 	usage; exit 1;;
> +esac
> +
>  # see http://mywiki.wooledge.org/BashFAQ/020
>  while IFS= read -u 3 -r -d '' pacfile; do
>  	file="${pacfile%.pac*}"
>