From 818766d3d43f501deedb93e9b95ea1510ac00190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Sat, 6 Oct 2018 23:23:02 +0300
Subject: [PATCH] Use posix shell variable expansion substitution instead of
 subshells with sed

---
 wrappers/clang-target-wrapper.sh | 7 ++++---
 wrappers/dlltool-wrapper.sh      | 5 +++--
 wrappers/ld-wrapper.sh           | 5 +++--
 wrappers/objcopy-wrapper.sh      | 7 ++++---
 wrappers/windres-wrapper.sh      | 7 ++++---
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/wrappers/clang-target-wrapper.sh b/wrappers/clang-target-wrapper.sh
index cfc6b10..a6081f3 100755
--- a/wrappers/clang-target-wrapper.sh
+++ b/wrappers/clang-target-wrapper.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
 DIR="$(cd "$(dirname "$0")" && pwd)"
-TARGET="$(basename $0 | sed 's/-[^-]*$//')"
-EXE=$(basename $0 | sed 's/.*-\([^-]*\)/\1/')
-ARCH=$(echo $TARGET | sed 's/-.*//')
+BASENAME="$(basename "$0")"
+TARGET="${BASENAME%-*}"
+EXE="${BASENAME##*-}"
+ARCH="${TARGET%%-*}"
 
 # Allow setting e.g. CCACHE=1 to wrap all building in ccache.
 if [ -n "$CCACHE" ]; then
diff --git a/wrappers/dlltool-wrapper.sh b/wrappers/dlltool-wrapper.sh
index b3fe7f6..13f84bf 100755
--- a/wrappers/dlltool-wrapper.sh
+++ b/wrappers/dlltool-wrapper.sh
@@ -3,8 +3,9 @@
 DIR="$(cd "$(dirname "$0")" && pwd)"
 export PATH=$DIR:$PATH
 
-TARGET="$(basename $0 | sed 's/-[^-]*$//')"
-ARCH=$(echo $TARGET | sed 's/-.*//')
+BASENAME="$(basename "$0")"
+TARGET="${BASENAME%-*}"
+ARCH="${TARGET%%-*}"
 case $ARCH in
 i686)    M=i386        ;;
 x86_64)  M=i386:x86-64 ;;
diff --git a/wrappers/ld-wrapper.sh b/wrappers/ld-wrapper.sh
index 519e126..c45c1a6 100755
--- a/wrappers/ld-wrapper.sh
+++ b/wrappers/ld-wrapper.sh
@@ -19,8 +19,9 @@ if [ "$1" = "-v" ]; then
     exit 0
 fi
 
-TARGET="$(basename $0 | sed 's/-[^-]*$//')"
-ARCH=$(echo $TARGET | sed 's/-.*//')
+BASENAME="$(basename "$0")"
+TARGET="${BASENAME%-*}"
+ARCH="${TARGET%%-*}"
 case $ARCH in
 i686)    M=i386pe   ;;
 x86_64)  M=i386pep  ;;
diff --git a/wrappers/objcopy-wrapper.sh b/wrappers/objcopy-wrapper.sh
index 8e6ef64..f320e85 100755
--- a/wrappers/objcopy-wrapper.sh
+++ b/wrappers/objcopy-wrapper.sh
@@ -3,9 +3,10 @@
 set -e
 
 DIR="$(cd "$(dirname "$0")" && pwd)"
-TARGET="$(basename $0 | sed 's/-[^-]*$//')"
-EXE=$(basename $0 | sed 's/.*-\([^-]*\)/\1/')
-ARCH=$(echo $TARGET | sed 's/-.*//')
+BASENAME="$(basename "$0")"
+TARGET="${BASENAME%-*}"
+EXE="${BASENAME##*-}"
+ARCH="${TARGET%%-*}"
 
 IN=""
 OUT=""
diff --git a/wrappers/windres-wrapper.sh b/wrappers/windres-wrapper.sh
index 7524592..13d3b46 100755
--- a/wrappers/windres-wrapper.sh
+++ b/wrappers/windres-wrapper.sh
@@ -86,8 +86,9 @@ INPUT_FORMAT=rc
 OUTPUT_FORMAT=coff
 CODEPAGE=1252
 CPP_OPTIONS=
-TARGET="$(basename $0 | sed 's/-[^-]*$//')"
-PROG="$(basename $0)"
+BASENAME="$(basename "$0")"
+TARGET="${BASENAME%-*}"
+PROG="$BASENAME"
 
 while [ $# != 0 ]; do
     case "$1" in
@@ -155,7 +156,7 @@ while [ $# != 0 ]; do
     shift
 done
 
-ARCH=$(echo $TARGET | sed 's/-.*//')
+ARCH="${TARGET%%-*}"
 case $ARCH in
 i686)    M=X86 ;;
 x86_64)  M=X64 ;;