From d6953d60f015da65ff893e86be175c222fa05628 Mon Sep 17 00:00:00 2001 From: orbea Date: Thu, 16 Nov 2017 13:20:12 -0800 Subject: [PATCH] libretro-buildbot-recipe.sh: Remove more use of cut. --- libretro-buildbot-recipe.sh | 8 ++++---- recipes/android/cores-android-armv7-ndk-mame.conf | 1 - recipes/linux/cores-linux-x64-cross.conf | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 2f3fc054..8860c1ee 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -23,8 +23,8 @@ ENTRY_ID="" # ----- read variables from recipe config ----- while read line; do [ -z "${line}" ] && continue - KEY=`echo $line | cut -f 1 -d " "` - VALUE=`echo $line | cut -f 2 -d " "` + KEY="${line% *}" + VALUE="${line#* }" rm -f -- "$TMPDIR/vars" if [ "${KEY}" = "PATH" ]; then export PATH=${VALUE}:${ORIGPATH} @@ -33,7 +33,7 @@ while read line; do export ${KEY}=${VALUE} echo ${KEY}=${VALUE} >> $TMPDIR/vars fi - echo Setting: ${KEY} ${VALUE} + echo "Setting: ${KEY} ${VALUE}" done < $1.conf read_link() @@ -410,7 +410,7 @@ build_libretro_leiradel_makefile() { ENTRY_ID=`curl -X POST -d type="start" -d master_log="$MASTER_LOG_ID" -d platform="$jobid" -d name="$NAME" http://buildbot.fiveforty.net/build_entry/` fi - ARG1=`echo ${ARGS} | cut -f 1 -d " "` + ARG1="${ARGS%% *}" mkdir -p $RARCH_DIST_DIR/${DIST}/${ARG1} cd $DIR diff --git a/recipes/android/cores-android-armv7-ndk-mame.conf b/recipes/android/cores-android-armv7-ndk-mame.conf index 423a25ac..82d4c616 100644 --- a/recipes/android/cores-android-armv7-ndk-mame.conf +++ b/recipes/android/cores-android-armv7-ndk-mame.conf @@ -8,4 +8,3 @@ LIBSUFFIX _android MAKE make DIST armeabi-v7a CORE_JOB YES - diff --git a/recipes/linux/cores-linux-x64-cross.conf b/recipes/linux/cores-linux-x64-cross.conf index 8a0894b7..fa847b11 100644 --- a/recipes/linux/cores-linux-x64-cross.conf +++ b/recipes/linux/cores-linux-x64-cross.conf @@ -4,4 +4,3 @@ MAKEPORTABLE YES CORE_JOB YES MAKE make PATH /usr/lib/ccache -