[PATCH v2 4/8] config.guess: automatic fixups after previous automated patch

[Jacob Bachmeyer]

This patch was generated using the following command:

  sed -i config.guess \
      -e '/="[^"]\+"\(-\|$\)/s/="\([^"([:space:])]\+\)"/=\1/' \
      -e '/="[^"]\+"[[:alnum:]]/s/="\$\([^([:space:])]\+\)"/=${\1}/' \
      -e \
'/\$(echo[^|]\+|/s/\([^[:space:]]\)[[:space:]]*|[[:space:]]*sed/\1 | sed/g'

* config.guess: remove unneeded quotes in other variable assignments
* config.guess: standardize spacing for "echo ... | sed" substitutions
---
 config.guess | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/config.guess b/config.guess
index eeda94e..d2bdee7 100755
--- a/config.guess
+++ b/config.guess
@@ -115,7 +115,7 @@ set_cc_for_build() {
        ,,)    echo "int x;" > "$dummy.c"
               for driver in cc gcc c89 c99 ; do
                   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; 
then
-                      CC_FOR_BUILD="$driver"
+                      CC_FOR_BUILD=$driver
                       break
                   fi
               done
@@ -205,9 +205,9 @@ case 
$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
            earmv*)
                arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 
's,^e\(armv[0-9]\).*$,\1,')
                endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 
's,^.*\(eb\)$,\1,p')
-               machine="${arch}${endian}"-unknown
+               machine=${arch}${endian}-unknown
                ;;
-           *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
+           *) machine=$UNAME_MACHINE_ARCH-unknown ;;
        esac
        # The Operating System including object format, if it has switched
        # to ELF recently (or will in the future) and ABI.
@@ -608,7 +608,7 @@ EOF
        if test -x /usr/bin/oslevel ; then
                IBM_REV=$(/usr/bin/oslevel)
        else
-               IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+               IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
        fi
        GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
        ;;
@@ -649,7 +649,7 @@ EOF
                IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc |
                           awk -F: '{ print $3 }' | sed s/[0-9]*$/0/)
        else
-               IBM_REV="$UNAME_VERSION.$UNAME_RELEASE"
+               IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
        fi
        GUESS=$IBM_ARCH-ibm-aix$IBM_REV
        ;;
@@ -675,7 +675,7 @@ EOF
        GUESS=m68k-hp-bsd4.4
        ;;
     9000/[34678]??:HP-UX:*:*)
-       HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//')
+       HPUX_REV=$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//')
        case $UNAME_MACHINE in
            9000/31?)            HP_ARCH=m68000 ;;
            9000/[34]??)         HP_ARCH=m68k ;;
@@ -757,7 +757,7 @@ EOF
        GUESS=$HP_ARCH-hp-hpux$HPUX_REV
        ;;
     ia64:HP-UX:*:*)
-       HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//')
+       HPUX_REV=$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//')
        GUESS=ia64-hp-hpux$HPUX_REV
        ;;
     3050*:HI-UX:*:*)
@@ -943,11 +943,11 @@ EOF
        ;;
     *:GNU:*:*)
        # the GNU system
-       GUESS="$(echo "$UNAME_MACHINE"|sed -e 
's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')"
+       GUESS="$(echo "$UNAME_MACHINE" | sed -e 
's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE" | sed -e 's,/.*$,,')"
        ;;
     *:GNU/*:*:*)
        # other systems with GNU libc and userland
-       GUESS="$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 
's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 
's/[-(].*//')-$LIBC"
+       GUESS="$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 
's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE" | sed -e 
's/[-(].*//')-$LIBC"
        ;;
     *:Minix:*:*)
        GUESS=$UNAME_MACHINE-unknown-minix
@@ -1139,7 +1139,7 @@ EOF
                (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
                grep IS_X32 >/dev/null
            then
-               LIBCABI="$LIBC"x32
+               LIBCABI=${LIBC}x32
            fi
        fi
        GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
@@ -1461,7 +1461,7 @@ EOF
        if test "${cputype-}" = 386; then
            UNAME_MACHINE=i386
        elif test "x${cputype-}" != x; then
-           UNAME_MACHINE="$cputype"
+           UNAME_MACHINE=$cputype
        fi
        GUESS=$UNAME_MACHINE-unknown-plan9
        ;;
-- 
2.17.1