Use posix shell variable expansion substitution instead of subshells with sed
This commit is contained in:
1 parent
0ec597b1bb
commit
818766d3d4
5 files changed
+18
-13
No files matched your search
@@ -1,8 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
DIR="$(cd "$(dirname "$0")" && pwd)"
|
DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||||
TARGET="$(basename $0 | sed 's/-[^-]*$//')"
|
BASENAME="$(basename "$0")"
|
||||||
EXE=$(basename $0 | sed 's/.*-\([^-]*\)/\1/')
|
TARGET="${BASENAME%-*}"
|
||||||
ARCH=$(echo $TARGET | sed 's/-.*//')
|
EXE="${BASENAME##*-}"
|
||||||
|
ARCH="${TARGET%%-*}"
|
||||||
|
|
||||||
# Allow setting e.g. CCACHE=1 to wrap all building in ccache.
|
# Allow setting e.g. CCACHE=1 to wrap all building in ccache.
|
||||||
if [ -n "$CCACHE" ]; then
|
if [ -n "$CCACHE" ]; then
|
||||||
|
|||||||
@@ -3,8 +3,9 @@
|
|||||||
DIR="$(cd "$(dirname "$0")" && pwd)"
|
DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||||
export PATH=$DIR:$PATH
|
export PATH=$DIR:$PATH
|
||||||
|
|
||||||
TARGET="$(basename $0 | sed 's/-[^-]*$//')"
|
BASENAME="$(basename "$0")"
|
||||||
ARCH=$(echo $TARGET | sed 's/-.*//')
|
TARGET="${BASENAME%-*}"
|
||||||
|
ARCH="${TARGET%%-*}"
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
i686) M=i386 ;;
|
i686) M=i386 ;;
|
||||||
x86_64) M=i386:x86-64 ;;
|
x86_64) M=i386:x86-64 ;;
|
||||||
|
|||||||
@@ -19,8 +19,9 @@ if [ "$1" = "-v" ]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
TARGET="$(basename $0 | sed 's/-[^-]*$//')"
|
BASENAME="$(basename "$0")"
|
||||||
ARCH=$(echo $TARGET | sed 's/-.*//')
|
TARGET="${BASENAME%-*}"
|
||||||
|
ARCH="${TARGET%%-*}"
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
i686) M=i386pe ;;
|
i686) M=i386pe ;;
|
||||||
x86_64) M=i386pep ;;
|
x86_64) M=i386pep ;;
|
||||||
|
|||||||
@@ -3,9 +3,10 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
DIR="$(cd "$(dirname "$0")" && pwd)"
|
DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||||
TARGET="$(basename $0 | sed 's/-[^-]*$//')"
|
BASENAME="$(basename "$0")"
|
||||||
EXE=$(basename $0 | sed 's/.*-\([^-]*\)/\1/')
|
TARGET="${BASENAME%-*}"
|
||||||
ARCH=$(echo $TARGET | sed 's/-.*//')
|
EXE="${BASENAME##*-}"
|
||||||
|
ARCH="${TARGET%%-*}"
|
||||||
|
|
||||||
IN=""
|
IN=""
|
||||||
OUT=""
|
OUT=""
|
||||||
|
|||||||
@@ -86,8 +86,9 @@ INPUT_FORMAT=rc
|
|||||||
OUTPUT_FORMAT=coff
|
OUTPUT_FORMAT=coff
|
||||||
CODEPAGE=1252
|
CODEPAGE=1252
|
||||||
CPP_OPTIONS=
|
CPP_OPTIONS=
|
||||||
TARGET="$(basename $0 | sed 's/-[^-]*$//')"
|
BASENAME="$(basename "$0")"
|
||||||
PROG="$(basename $0)"
|
TARGET="${BASENAME%-*}"
|
||||||
|
PROG="$BASENAME"
|
||||||
|
|
||||||
while [ $# != 0 ]; do
|
while [ $# != 0 ]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
@@ -155,7 +156,7 @@ while [ $# != 0 ]; do
|
|||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
ARCH=$(echo $TARGET | sed 's/-.*//')
|
ARCH="${TARGET%%-*}"
|
||||||
case $ARCH in
|
case $ARCH in
|
||||||
i686) M=X86 ;;
|
i686) M=X86 ;;
|
||||||
x86_64) M=X64 ;;
|
x86_64) M=X64 ;;
|
||||||
|
|||||||
Reference in new issue
Block a user