[pacman-dev] [PATCH 5/5] makepkg: move negation in inequality comparisons

[Dave Reisner]

This commit changes the few remaining instances of:

  [[ ! $foo = "$bar" ]]

to the more common:

  [[ $foo != "$bar" ]]
---
 scripts/makepkg.sh.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index c7061c0..f74b1b1 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1027,12 +1027,12 @@ source_has_signatures() {
 
 run_pacman() {
        local cmd
-       if [[ ! $1 = -@(T|Qq) ]]; then
+       if [[ $1 != -@(T|Qq) ]]; then
                cmd=("$PACMAN_PATH" $PACMAN_OPTS "$@")
        else
                cmd=("$PACMAN_PATH" "$@")
        fi
-       if [[ ! $1 = -@(T|Qq) ]]; then
+       if [[ $1 != -@(T|Qq) ]]; then
                if type -p sudo >/dev/null; then
                        cmd=(sudo "${cmd[@]}")
                else
@@ -1189,7 +1189,7 @@ generate_one_checksum() {
                                sum="SKIP"
                                ;;
                        *)
-                               if [[ ! $netfile = *.@(sig?(n)|asc) ]]; then
+                               if [[ $netfile != *.@(sig?(n)|asc) ]]; then
                                        local file
                                        file="$(get_filepath "$netfile")" || 
missing_source_file "$netfile"
                                        sum="$(openssl dgst -${integ} "$file")"
@@ -1407,7 +1407,7 @@ check_pgpsigs() {
        esac
        for file in "${all_sources[@]}"; do
                file="$(get_filename "$file")"
-               if [[ ! $file = *.@(sig?(n)|asc) ]]; then
+               if [[ $file != *.@(sig?(n)|asc) ]]; then
                        continue
                fi
 
@@ -3202,7 +3202,7 @@ PACMAN_PATH=$(type -P $PACMAN)
 
 # check if messages are to be printed using color
 unset ALL_OFF BOLD BLUE GREEN RED YELLOW
-if [[ -t 2 && ! $USE_COLOR = "n" ]] && check_buildenv "color" "y"; then
+if [[ -t 2 && $USE_COLOR != "n" ]] && check_buildenv "color" "y"; then
        # prefer terminal safe colored and bold text when tput is supported
        if tput setaf 0 &>/dev/null; then
                ALL_OFF="$(tput sgr0)"
-- 
2.0.4