Changeset 40c0483 in mainline

Timestamp:

2019-08-16T20:58:02Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d3db35b

Parents:

5284faa

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-07-21 14:03:59)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-16 20:58:02)

Message:

Make shell script tools more portable

Location:

tools

Files:

• build-ccheck.sh (modified) (1 diff)
• cc.sh (modified) (1 diff)
• ccheck.sh (modified) (4 diffs)
• toolchain.sh (modified) (8 diffs)

tools/build-ccheck.sh

@@ -1 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Copyright (c) 2019 Jiri Svoboda

tools/cc.sh

@@ -1 @@
-#! /bin/bash
+#!/bin/sh
 
 #

tools/ccheck.sh

@@ -1 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Copyright (c) 2018 Jiri Svoboda
@@ -33 +33 @@
 fi
 
-if [ ."$1" == .--fix ] ; then
+if [ ."$1" = .--fix ]; then
         opt=--fix
 else
@@ -49 +49 @@
         outfile="$(mktemp)"
         "$ccheck" $opt $fname >"$outfile" 2>&1
-        rc=$?
-        if [ .$rc == .0 ]; then
+        if [ $? -eq 0 ]; then
                 if [ -s "$outfile" ] ; then
                         srepcnt=$((srepcnt + 1))
@@ -65 +64 @@
 done
 
-if [ $srepcnt == 0 -a $fcnt == 0 ] ; then
+if [ $srepcnt -eq 0 ] && [ $fcnt -eq 0 ]; then
         echo "Ccheck passed."
 else

tools/toolchain.sh

@@ -1 @@
-#! /bin/bash
+#!/bin/sh
 
 #
@@ -103 +103 @@
         echo
         
-        if [ -z "$1" ] || [ "$1" == "all" ] ; then
-                PLATFORMS=("amd64" "arm32" "arm64" "ia32" "ia64" "mips32" "mips32eb" "ppc32" "riscv64" "sparc64")
+        if [ -z "$1" ] || [ "$1" = "all" ] ; then
+                PLATFORMS='amd64 arm32 arm64 ia32 ia64 mips32 mips32eb ppc32 riscv64 sparc64'
         else
-                PLATFORMS=("$1")
+                PLATFORMS="$1"
         fi
         
@@ -114 +114 @@
         fi
 
-        for i in "${PLATFORMS[@]}"
+        for i in $PLATFORMS
         do
                 PLATFORM="$i"
@@ -121 +121 @@
 
                 echo "== $PLATFORM =="
-                test_app_version "Binutils" "ld" "GNU\ ld\ \(GNU\ Binutils\)\ ((\.|[0-9])+)" "$BINUTILS_VERSION"
-                test_app_version "GCC" "gcc" "gcc\ version\ ((\.|[0-9])+)" "$GCC_VERSION"
-                test_app_version "GDB" "gdb" "GNU\ gdb\ \(GDB\)\s+((\.|[0-9])+)" "$GDB_VERSION"
+                test_app_version "Binutils" "ld" "GNU ld (.*) \([.0-9]*\)" "$BINUTILS_VERSION"
+                test_app_version "GCC" "gcc" "gcc version \([.0-9]*\)" "$GCC_VERSION"
+                test_app_version "GDB" "gdb" "GNU gdb (.*)[[:space:]]\+\([.0-9]*\)" "$GDB_VERSION"
         done
 
@@ -140 +140 @@
                 echo "- $PKGNAME is missing"
         else
-                {
-                        OUT=$(${APP} -v 2>&1)
-                } &> /dev/null
-
-                if [[ "$OUT" =~ $REGEX ]]; then
-                VERSION="${BASH_REMATCH[1]}"
-                if [ "$INS_VERSION" = "$VERSION" ]; then
-                        echo "+ $PKGNAME is uptodate ($INS_VERSION)"
-                else
-                        echo "- $PKGNAME ($VERSION) is outdated ($INS_VERSION)"
-                fi
-            else
-                echo "- $PKGNAME Unexpected output"
-            fi
+                VERSION=`${APP} -v 2>&1 | sed -n "s:^${REGEX}.*:\1:p"`
+
+                if [ -z "$VERSION" ]; then
+                        echo "- $PKGNAME Unexpected output"
+                        return 1
+                fi
+
+                if [ "$INS_VERSION" = "$VERSION" ]; then
+                        echo "+ $PKGNAME is uptodate ($INS_VERSION)"
+                else
+                        echo "- $PKGNAME ($VERSION) is outdated ($INS_VERSION)"
+                fi
         fi
 }
@@ -160 +158 @@
 
 change_title() {
-        echo -en "\e]0;$1\a"
+        printf "\e]0;$1\a"
 }
 
@@ -171 +169 @@
         fi
 
-        echo -n "${TM} "
+        printf "${TM} "
         change_title "${TM}"
         sleep 1
@@ -222 +220 @@
         OUTSIDE="$1"
         BASE="$2"
-        ORIGINAL="`pwd`"
+        ORIGINAL="$PWD"
+
+        cd "${BASE}"
+        check_error $? "Unable to change directory to ${BASE}."
+        ABS_BASE="$PWD"
+        cd "${ORIGINAL}"
+        check_error $? "Unable to change directory to ${ORIGINAL}."
 
         mkdir -p "${OUTSIDE}"
-
         cd "${OUTSIDE}"
         check_error $? "Unable to change directory to ${OUTSIDE}."
-        ABS_OUTSIDE="`pwd`"
-
-        cd "${BASE}"
-        check_error $? "Unable to change directory to ${BASE}."
-        ABS_BASE="`pwd`"
+
+        while [ "${#PWD}" -gt "${#ABS_BASE}" ]; do
+                cd ..
+        done
+
+        if [ "$PWD" = "$ABS_BASE" ]; then
+                echo
+                echo "CROSS_PREFIX cannot reside within the working directory."
+
+                exit 5
+        fi
 
         cd "${ORIGINAL}"
         check_error $? "Unable to change directory to ${ORIGINAL}."
-
-        BASE_LEN="${#ABS_BASE}"
-        OUTSIDE_TRIM="${ABS_OUTSIDE:0:${BASE_LEN}}"
-
-        if [ "${OUTSIDE_TRIM}" == "${ABS_BASE}" ] ; then
-                echo
-                echo "CROSS_PREFIX cannot reside within the working directory."
-
-                exit 5
-        fi
 }