From 2c6e9e1a311418f99d7c003cac928871664574da Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 06:19:21 -0800
Subject: [PATCH 01/11] Fix a couple of bashisms in libretro-config.sh

---
 libretro-config.sh | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/libretro-config.sh b/libretro-config.sh
index c5baefe9..8defba14 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -1,33 +1,38 @@
 #!/bin/bash
+# vi: ts=3 sw=3 et
 
 # Architecture Assignment
-[[ -z "$ARCH" ]] && ARCH="$(uname -m)"
-case "$ARCH" in
+[ -z "${ARCH}" ] && ARCH="`uname -m`"
+case "${ARCH}" in
    x86_64)
-      X86=true && X86_64=true
+      X86=true
+      X86_64=true
+      ;;
+   i386|i686)
+      X86=true
       ;;
-   i686)   X86=true;;
    armv*)
-      ARM=true && export FORMAT_COMPILER_TARGET=armv
+      ARM=true
+      export FORMAT_COMPILER_TARGET=armv
       export RARCHCFLAGS="${RARCHCFLAGS} -marm"
-      case "$ARCH" in
-         armv5tel) ARMV5=true;;
-         armv6l)   ARMV6=true;;
-         armv7l)   ARMV7=true;;
-      esac;;
+      case "${ARCH}" in
+         armv5tel) ARMV5=true ;;
+         armv6l)   ARMV6=true ;;
+         armv7l)   ARMV7=true ;;
+      esac
+      ;;
 esac
-
-if [[ -n "$PROCESSOR_ARCHITEW6432" && $PROCESSOR_ARCHITEW6432 -eq "AMD64" ]]; then
+if [ -n "${PROCESSOR_ARCHITEW6432}" -a "${PROCESSOR_ARCHITEW6432}" = "AMD64" ]; then
    ARCH=x86_64
    X86=true && X86_64=true
 fi
 
 if [ -z "$JOBS" ]; then
-  if command -v nproc >/dev/null; then
-     JOBS=$(nproc)
-  else
-     JOBS=1
-  fi
+   if command -v nproc >/dev/null; then
+      JOBS=`nproc`
+   else
+      JOBS=1
+   fi
 fi
 
 # Platform Assignment

From 52756be36a2acf8635f9bf32c0c3448aebcc3997 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 07:13:01 -0800
Subject: [PATCH 02/11] Turned CPU detection into a function

---
 libretro-config.sh | 53 +++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/libretro-config.sh b/libretro-config.sh
index 8defba14..fe982e1a 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -2,30 +2,35 @@
 # vi: ts=3 sw=3 et
 
 # Architecture Assignment
-[ -z "${ARCH}" ] && ARCH="`uname -m`"
-case "${ARCH}" in
-   x86_64)
-      X86=true
-      X86_64=true
-      ;;
-   i386|i686)
-      X86=true
-      ;;
-   armv*)
-      ARM=true
-      export FORMAT_COMPILER_TARGET=armv
-      export RARCHCFLAGS="${RARCHCFLAGS} -marm"
-      case "${ARCH}" in
-         armv5tel) ARMV5=true ;;
-         armv6l)   ARMV6=true ;;
-         armv7l)   ARMV7=true ;;
-      esac
-      ;;
-esac
-if [ -n "${PROCESSOR_ARCHITEW6432}" -a "${PROCESSOR_ARCHITEW6432}" = "AMD64" ]; then
-   ARCH=x86_64
-   X86=true && X86_64=true
-fi
+config_cpu() {
+   [ -n "${2}" ] && ARCH=${1}
+   [ -z "${ARCH}" ] && ARCH="`uname -m`"
+   case "${ARCH}" in
+      x86_64)
+         X86=true
+         X86_64=true
+         ;;
+      i386|i686)
+         X86=true
+         ;;
+      armv*)
+         ARM=true
+         export FORMAT_COMPILER_TARGET=armv
+         export RARCHCFLAGS="${RARCHCFLAGS} -marm"
+         case "${ARCH}" in
+            armv5tel) ARMV5=true ;;
+            armv6l)   ARMV6=true ;;
+            armv7l)   ARMV7=true ;;
+         esac
+         ;;
+   esac
+   if [ -n "${PROCESSOR_ARCHITEW6432}" -a "${PROCESSOR_ARCHITEW6432}" = "AMD64" ]; then
+      ARCH=x86_64
+      X86=true && X86_64=true
+   fi
+}
+
+config_cpu
 
 if [ -z "$JOBS" ]; then
    if command -v nproc >/dev/null; then

From a74687bfc1d2c2fbddeb4b0635603c4781b40da3 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 07:20:38 -0800
Subject: [PATCH 03/11] Bashism, coding style consistency

---
 libretro-config.sh | 47 +++++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/libretro-config.sh b/libretro-config.sh
index fe982e1a..05cba1b2 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -41,44 +41,53 @@ if [ -z "$JOBS" ]; then
 fi
 
 # Platform Assignment
-[ -z "$platform" ] && platform="$(uname)"
+[ -z "$platform" ] && platform="`uname`"
 case "$platform" in
    *BSD*)
-      FORMAT_EXT='so'
+      FORMAT_EXT="so"
       FORMAT_COMPILER_TARGET=unix
-      DIST_DIR=bsd;;
+      DIST_DIR=bsd
+      ;;
    osx|*Darwin*)
-      FORMAT_EXT='dylib'
+      FORMAT_EXT="dylib"
       FORMAT_COMPILER_TARGET=osx
-      DIST_DIR=osx;;
+      DIST_DIR=osx
+      ;;
    win|*mingw32*|*MINGW32*|*MSYS_NT*)
-      FORMAT_EXT='dll'
+      FORMAT_EXT="dll"
       FORMAT_COMPILER_TARGET=win
-      DIST_DIR=win_x86;;
+      DIST_DIR=win_x86
+      ;;
    win64|*mingw64*|*MINGW64*)
-      FORMAT_EXT='dll'
+      FORMAT_EXT="dll"
       FORMAT_COMPILER_TARGET=win
-      DIST_DIR=win_x64;;
+      DIST_DIR=win_x64
+      ;;
    *psp1*)
-      FORMAT_EXT='a'
+      FORMAT_EXT="a"
       FORMAT_COMPILER_TARGET=psp1
-      DIST_DIR=psp1;;
+      DIST_DIR=psp1
+      ;;
    *ios|theos_ios*)
-      FORMAT_EXT='dylib'
+      FORMAT_EXT="dylib"
       FORMAT_COMPILER_TARGET=theos_ios
-      DIST_DIR=theos;;
+      DIST_DIR=theos
+      ;;
    android)
-      FORMAT_EXT='so'
+      FORMAT_EXT="so"
       FORMAT_COMPILER_TARGET=android
-      DIST_DIR=android;;
+      DIST_DIR=android
+      ;;
    *android-armv7*)
-      FORMAT_EXT='so'
+      FORMAT_EXT="so"
       FORMAT_COMPILER_TARGET=android-armv7
-      DIST_DIR=android/armeabi-v7a;;
+      DIST_DIR=android/armeabi-v7a
+      ;;
    *)
-      FORMAT_EXT='so'
+      FORMAT_EXT="so"
       FORMAT_COMPILER_TARGET=unix
-      DIST_DIR=unix;;
+      DIST_DIR=unix
+      ;;
 esac
 
 export FORMAT_COMPILER_TARGET_ALT="$FORMAT_COMPILER_TARGET"

From 158bde99b83f52f87a4daafeaf1318a395aa4496 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 07:28:24 -0800
Subject: [PATCH 04/11] Platform detection is now a function

---
 libretro-config.sh | 106 +++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 51 deletions(-)

diff --git a/libretro-config.sh b/libretro-config.sh
index 05cba1b2..f60190f6 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -30,7 +30,62 @@ config_cpu() {
    fi
 }
 
+# Platform Assignment
+config_platform() {
+   [ -n "${1}" ] && platform="${1}"
+   [ -z "${platform}" ] && platform="`uname`"
+   case "${platform}" in
+      *BSD*)
+         FORMAT_EXT="so"
+         FORMAT_COMPILER_TARGET="unix"
+         DIST_DIR="bsd"
+         ;;
+      osx|*Darwin*)
+         FORMAT_EXT="dylib"
+         FORMAT_COMPILER_TARGET="osx"
+         DIST_DIR="osx"
+         ;;
+      win|*mingw32*|*MINGW32*|*MSYS_NT*)
+         FORMAT_EXT="dll"
+         FORMAT_COMPILER_TARGET="win"
+         DIST_DIR="win_x86"
+         ;;
+      win64|*mingw64*|*MINGW64*)
+         FORMAT_EXT="dll"
+         FORMAT_COMPILER_TARGET="win"
+         DIST_DIR="win_x64"
+         ;;
+      *psp1*)
+         FORMAT_EXT="a"
+         FORMAT_COMPILER_TARGET="psp1"
+         DIST_DIR="psp1"
+         ;;
+      *ios|theos_ios*)
+         FORMAT_EXT="dylib"
+         FORMAT_COMPILER_TARGET="theos_ios"
+         DIST_DIR="theos"
+         ;;
+      android)
+         FORMAT_EXT="so"
+         FORMAT_COMPILER_TARGET="android"
+         DIST_DIR="android"
+         ;;
+      *android-armv7*)
+         FORMAT_EXT="so"
+         FORMAT_COMPILER_TARGET="android-armv7"
+         DIST_DIR="android/armeabi-v7a"
+         ;;
+      *)
+         FORMAT_EXT="so"
+         FORMAT_COMPILER_TARGET="unix"
+         DIST_DIR="unix"
+         ;;
+   esac
+   export FORMAT_COMPILER_TARGET_ALT="$FORMAT_COMPILER_TARGET"
+}
+
 config_cpu
+config_platform
 
 if [ -z "$JOBS" ]; then
    if command -v nproc >/dev/null; then
@@ -40,57 +95,6 @@ if [ -z "$JOBS" ]; then
    fi
 fi
 
-# Platform Assignment
-[ -z "$platform" ] && platform="`uname`"
-case "$platform" in
-   *BSD*)
-      FORMAT_EXT="so"
-      FORMAT_COMPILER_TARGET=unix
-      DIST_DIR=bsd
-      ;;
-   osx|*Darwin*)
-      FORMAT_EXT="dylib"
-      FORMAT_COMPILER_TARGET=osx
-      DIST_DIR=osx
-      ;;
-   win|*mingw32*|*MINGW32*|*MSYS_NT*)
-      FORMAT_EXT="dll"
-      FORMAT_COMPILER_TARGET=win
-      DIST_DIR=win_x86
-      ;;
-   win64|*mingw64*|*MINGW64*)
-      FORMAT_EXT="dll"
-      FORMAT_COMPILER_TARGET=win
-      DIST_DIR=win_x64
-      ;;
-   *psp1*)
-      FORMAT_EXT="a"
-      FORMAT_COMPILER_TARGET=psp1
-      DIST_DIR=psp1
-      ;;
-   *ios|theos_ios*)
-      FORMAT_EXT="dylib"
-      FORMAT_COMPILER_TARGET=theos_ios
-      DIST_DIR=theos
-      ;;
-   android)
-      FORMAT_EXT="so"
-      FORMAT_COMPILER_TARGET=android
-      DIST_DIR=android
-      ;;
-   *android-armv7*)
-      FORMAT_EXT="so"
-      FORMAT_COMPILER_TARGET=android-armv7
-      DIST_DIR=android/armeabi-v7a
-      ;;
-   *)
-      FORMAT_EXT="so"
-      FORMAT_COMPILER_TARGET=unix
-      DIST_DIR=unix
-      ;;
-esac
-
-export FORMAT_COMPILER_TARGET_ALT="$FORMAT_COMPILER_TARGET"
 
 echo "PLATFORM: $platform"
 echo "ARCHITECTURE: $ARCH"

From e3f874cb11020d87002d2d7afa71ea5e1462bd19 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 07:37:45 -0800
Subject: [PATCH 05/11] Build host report is now a function

---
 libretro-config.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libretro-config.sh b/libretro-config.sh
index f60190f6..8d8d1f79 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -84,8 +84,15 @@ config_platform() {
    export FORMAT_COMPILER_TARGET_ALT="$FORMAT_COMPILER_TARGET"
 }
 
+config_log_build_host() {
+   echo "PLATFORM: ${platform}"
+   echo "ARCHITECTURE: ${ARCH}"
+   echo "TARGET: ${FORMAT_COMPILER_TARGET}"
+}
+
 config_cpu
 config_platform
+config_log_build_host
 
 if [ -z "$JOBS" ]; then
    if command -v nproc >/dev/null; then
@@ -95,12 +102,6 @@ if [ -z "$JOBS" ]; then
    fi
 fi
 
-
-echo "PLATFORM: $platform"
-echo "ARCHITECTURE: $ARCH"
-echo "TARGET: $FORMAT_COMPILER_TARGET"
-
-
 #if uncommented, will fetch repos with read+write access. Useful for committers
 #export WRITERIGHTS=1
 

From 0ada2ddbd1a41b9dacf78ce8f3f85cf4dd6b52f0 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 09:33:50 -0800
Subject: [PATCH 06/11] libretro-fetch.sh should now run anywhere

---
 libretro-fetch.sh | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 3ceb5392..1caf84a7 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -1,7 +1,27 @@
 #! /bin/bash
 # vi: sw=3 ts=3 et
 
-. ./libretro-config.sh
+# BSDs don't have readlink -f
+read_link()
+{
+   TARGET_FILE="${1}"
+   cd "`dirname "${TARGET_FILE}"`"
+   TARGET_FILE="`basename "${TARGET_FILE}"`"
+
+   while [ -L "${TARGET_FILE}" ]; do
+      TARGET_FILE="`readlink "${TARGET_FILE}"`"
+      cd "`dirname "${TARGET_FILE}"`"
+      TARGET_FILE="`basename "${TARGET_FILE}"`"
+   done
+
+   PHYS_DIR="`pwd -P`"
+   RESULT="${PHYS_DIR}/${TARGET_FILE}"
+   echo ${RESULT}
+}
+SCRIPT="`read_link "$0"`"
+BASE_DIR="`dirname "${SCRIPT}"`"
+
+. ${BASE_DIR}/libretro-config.sh
 
 WORKDIR=$(pwd)
 

From 189fed77e2299abba484540875286f784d9d3d63 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 09:57:07 -0800
Subject: [PATCH 07/11] libretro-build.sh now runs anywhere

---
 libretro-build-common.sh | 26 +++++++++++++-------------
 libretro-build.sh        | 38 +++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 7cf9d859..3596e069 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+# vi: ts=3 sw=3 et ft=bash
 
 die() {
    echo $1
@@ -59,7 +59,7 @@ reset_compiler_targets() {
 }
 
 build_libretro_pcsx_rearmed_interpreter() {
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d 'libretro-pcsx_rearmed' ]; then
       echo '=== Building PCSX ReARMed Interpreter ==='
       cd libretro-pcsx_rearmed
@@ -81,7 +81,7 @@ build_libretro_pcsx_rearmed_interpreter() {
 # $4 is Makefile name
 # $5 is preferred platform
 build_libretro_generic_makefile_subcore() {
-   cd $BASE_DIR
+   cd ${WORKDIR}
    if [ -d "libretro-${1}" ]; then
       echo "=== Building ${2} ==="
       cd libretro-${1}/
@@ -124,7 +124,7 @@ copy_core_to_dist() {
 # $3 is Makefile name
 # $4 is preferred platform
 build_libretro_generic_makefile() {
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d "libretro-${1}" ]; then
       echo "=== Building ${1} ==="
       cd libretro-${1}
@@ -364,7 +364,7 @@ build_libretro_ppsspp() {
 
 
 build_libretro_mame() {
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d 'libretro-mame' ]; then
       echo ''
       echo '=== Building MAME ==='
@@ -397,7 +397,7 @@ build_libretro_mame() {
 }
 
 build_libretro_mess() {
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d 'libretro-mame' ]; then
       echo ''
       echo '=== Building MESS ==='
@@ -424,7 +424,7 @@ build_libretro_mess() {
 }
 
 rebuild_libretro_mess() {
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d 'libretro-mame' ]; then
       echo ''
       echo '=== Building MESS ==='
@@ -451,7 +451,7 @@ rebuild_libretro_mess() {
 }
 
 build_libretro_ume() {
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d 'libretro-mame' ]; then
       echo ''
       echo '=== Building UME ==='
@@ -478,7 +478,7 @@ build_libretro_ume() {
 }
 
 rebuild_libretro_ume() {
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d 'libretro-mame' ]; then
       echo ''
       echo '=== Building MESS ==='
@@ -509,7 +509,7 @@ rebuild_libretro_ume() {
 # $3 is profile name
 # $4 is compiler
 build_libretro_bsnes_modern() {
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d "libretro-${1}" ]; then
       echo "=== Building ${1} ${3} ==="
       cd libretro-${1}
@@ -540,7 +540,7 @@ build_libretro_bsnes_mercury() {
 
 build_libretro_bsnes_cplusplus98() {
    CORENAME="bsnes_cplusplus98"
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d "libretro-${CORENAME}" ]; then
       echo "=== Building ${CORENAME} ==="
       cd libretro-${CORENAME}
@@ -557,7 +557,7 @@ build_libretro_bsnes_cplusplus98() {
 }
 
 build_libretro_bnes() {
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d 'libretro-bnes' ]; then
       echo '=== Building bNES ==='
       cd libretro-bnes
@@ -576,7 +576,7 @@ build_libretro_bnes() {
 
 build_libretro_mupen64() {
    check_opengl
-   cd "${BASE_DIR}"
+   cd "${WORKDIR}"
    if [ -d 'libretro-mupen64plus' ]; then
       cd libretro-mupen64plus
 
diff --git a/libretro-build.sh b/libretro-build.sh
index 3e6bce69..6e85ccf1 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -1,31 +1,31 @@
-#!/bin/bash
-
-. ./libretro-config.sh
+#! /bin/bash
+# vi: sw=3 ts=3 et
 
 # BSDs don't have readlink -f
 read_link()
 {
-   TARGET_FILE="$1"
-   cd $(dirname "$TARGET_FILE")
-   TARGET_FILE=$(basename "$TARGET_FILE")
+   TARGET_FILE="${1}"
+   cd "`dirname "${TARGET_FILE}"`"
+   TARGET_FILE="`basename "${TARGET_FILE}"`"
 
-   while [ -L "$TARGET_FILE" ]
-   do
-      TARGET_FILE=$(readlink "$TARGET_FILE")
-      cd $(dirname "$TARGET_FILE")
-      TARGET_FILE=$(basename "$TARGET_FILE")
+   while [ -L "${TARGET_FILE}" ]; do
+      TARGET_FILE="`readlink "${TARGET_FILE}"`"
+      cd "`dirname "${TARGET_FILE}"`"
+      TARGET_FILE="`basename "${TARGET_FILE}"`"
    done
 
-   PHYS_DIR=$(pwd -P)
-   RESULT="$PHYS_DIR/$TARGET_FILE"
-   echo $RESULT
+   PHYS_DIR="`pwd -P`"
+   RESULT="${PHYS_DIR}/${TARGET_FILE}"
+   echo ${RESULT}
 }
+SCRIPT="`read_link "$0"`"
+BASE_DIR="`dirname "${SCRIPT}"`"
+WORKDIR="`pwd`"
+
+. ${BASE_DIR}/libretro-config.sh
 
-SCRIPT=$(read_link "$0")
-echo "Script: $SCRIPT"
-BASE_DIR=$(dirname "$SCRIPT")
 if [ -z "$RARCH_DIST_DIR" ]; then
-   RARCH_DIR="$BASE_DIR/dist"
+   RARCH_DIR="${WORKDIR}/dist"
    RARCH_DIST_DIR="$RARCH_DIR/$DIST_DIR"
 fi
 
@@ -87,7 +87,7 @@ echo "CC = $CC"
 echo "CXX = $CXX"
 echo "STRIP = $STRIP"
 
-. ./libretro-build-common.sh
+. ${BASE_DIR}/libretro-build-common.sh
 
 mkdir -p "$RARCH_DIST_DIR"
 

From b7542c454b4a5f61036ce6db78894a55722f7fea Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 10:07:25 -0800
Subject: [PATCH 08/11] Changes associated with ${WORKDIR}

---
 libretro-config.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libretro-config.sh b/libretro-config.sh
index 8d8d1f79..3bd295fe 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -198,9 +198,9 @@ fi
 # Set this to disable the core build summary
 # export NOBUILD_SUMMARY=1
 
-BUILD_SUMMARY=$(pwd)/build-summary.log
-BUILD_SUCCESS=$(pwd)/build-success.log
-BUILD_FAIL=$(pwd)/build-fail.log
+BUILD_SUMMARY=${WORKDIR}/build-summary.log
+BUILD_SUCCESS=${WORKDIR}/build-success.log
+BUILD_FAIL=${WORKDIR}/build-fail.log
 if [ -z "${BUILD_SUMMARY_FMT}" ]; then
    if command -v column >/dev/null; then
       BUILD_SUMMARY_FMT=column
@@ -216,7 +216,7 @@ fi
 #local libretro-config-user.sh file rather than here.
 #The following below is just a sample.
 
-if [ -f "libretro-config-user.sh" ]; then
-. ./libretro-config-user.sh
+if [ -f "${WORKDIR}/libretro-config-user.sh" ]; then
+   . ${WORKDIR}/libretro-config-user.sh
 fi
 

From fdf1c3769af5431fde5bc63566a7ab077c276bc1 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 20:48:08 -0800
Subject: [PATCH 09/11] Remove a few bashisms

---
 libretro-build-common.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 3596e069..8316d981 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -1,4 +1,4 @@
-# vi: ts=3 sw=3 et ft=bash
+# vi: ts=3 sw=3 et ft=sh
 
 die() {
    echo $1
@@ -308,7 +308,6 @@ build_libretro_meteor() {
 }
 
 build_libretro_nestopia() {
-   echo command build_libretro_generic_makefile "nestopia" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET}
    build_libretro_generic_makefile "nestopia" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET}
 }
 
@@ -618,14 +617,14 @@ build_summary() {
    if [ -z "${NOBUILD_SUMMARY}" ]; then
       echo "=== Core Build Summary ===" > ${BUILD_SUMMARY}
       if [ -r "${BUILD_SUCCESS}" ]; then
-         echo "$(wc -l < ${BUILD_SUCCESS}) core(s) successfully built:" >> ${BUILD_SUMMARY}
+         echo "`wc -l < ${BUILD_SUCCESS}` core(s) successfully built:" >> ${BUILD_SUMMARY}
          ${BUILD_SUMMARY_FMT} ${BUILD_SUCCESS} >> ${BUILD_SUMMARY}
       else
          echo "      0 cores successfully built. :(" >> ${BUILD_SUMMARY}
-         echo "$(wc -l < ${BUILD_FAIL}) core(s) failed to build:"
+         echo "`wc -l < ${BUILD_FAIL}` core(s) failed to build:"
       fi
       if [ -r "${BUILD_FAIL}" ]; then
-         echo "$(wc -l < ${BUILD_FAIL}) core(s) failed to build:" >> ${BUILD_SUMMARY}
+         echo "`wc -l < ${BUILD_FAIL}` core(s) failed to build:" >> ${BUILD_SUMMARY}
          ${BUILD_SUMMARY_FMT} ${BUILD_FAIL} >> ${BUILD_SUMMARY}
       else
          echo "     0 cores failed to build! :D" >> ${BUILD_SUMMARY}

From 160af4b457f77ff6d80e6a521c922169b284a6f9 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 23:05:57 -0800
Subject: [PATCH 10/11] Moved compiler selection so it's all in one place

---
 libretro-build-common.sh | 56 +++++++++++++++++++++++++++++++++++
 libretro-build.sh        | 64 ----------------------------------------
 2 files changed, 56 insertions(+), 64 deletions(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 8316d981..36449c84 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -5,6 +5,57 @@ die() {
    #exit 1
 }
 
+if [ -z "$JOBS" ]; then
+   JOBS=7
+fi
+
+if [ "$HOST_CC" ]; then
+   CC="${HOST_CC}-gcc"
+   CXX="${HOST_CC}-g++"
+   CXX11="${HOST_CC}-g++"
+   STRIP="${HOST_CC}-strip"
+fi
+
+if [ -z "$MAKE" ]; then
+   if uname -s | grep -i MINGW32 > /dev/null 2>&1; then
+      MAKE=mingw32-make
+   else
+      if type gmake > /dev/null 2>&1; then
+         MAKE=gmake
+      else
+         MAKE=make
+      fi
+   fi
+fi
+
+
+if [ -z "$CC" ]; then
+   if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
+      CC=cc
+   elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
+      CC=mingw32-gcc
+   else
+      CC=gcc
+   fi
+fi
+
+if [ -z "$CXX" ]; then
+   if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
+      CXX=c++
+      CXX11="clang++ -std=c++11 -stdlib=libc++"
+   elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
+      CXX=mingw32-g++
+      CXX11=mingw32-g++
+   else
+      CXX=g++
+      CXX11=g++
+   fi
+fi
+
+FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET
+echo "CC = $CC"
+echo "CXX = $CXX"
+echo "STRIP = $STRIP"
 if [ "${CC}" ] && [ "${CXX}" ]; then
    COMPILER="CC=\"${CC}\" CXX=\"${CXX}\""
 else
@@ -27,6 +78,11 @@ echo "${FORMAT_COMPILER_TARGET_ALT}"
 RESET_FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET
 RESET_FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET_ALT
 
+if [ -z "$RARCH_DIST_DIR" ]; then
+   RARCH_DIR="${WORKDIR}/dist"
+   RARCH_DIST_DIR="$RARCH_DIR/$DIST_DIR"
+fi
+
 build_summary_log() {
    if [ -z "${NOBUILD_SUMMARY}" ]; then
       if [ "${1}" -eq "0" ]; then
diff --git a/libretro-build.sh b/libretro-build.sh
index 6e85ccf1..ce0b9c38 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -23,70 +23,6 @@ BASE_DIR="`dirname "${SCRIPT}"`"
 WORKDIR="`pwd`"
 
 . ${BASE_DIR}/libretro-config.sh
-
-if [ -z "$RARCH_DIST_DIR" ]; then
-   RARCH_DIR="${WORKDIR}/dist"
-   RARCH_DIST_DIR="$RARCH_DIR/$DIST_DIR"
-fi
-
-if [ -z "$JOBS" ]; then
-   JOBS=7
-fi
-
-die()
-{
-   echo $1
-   #exit 1
-}
-
-if [ "$HOST_CC" ]; then
-   CC="${HOST_CC}-gcc"
-   CXX="${HOST_CC}-g++"
-   CXX11="${HOST_CC}-g++"
-   STRIP="${HOST_CC}-strip"
-fi
-
-if [ -z "$MAKE" ]; then
-   if uname -s | grep -i MINGW32 > /dev/null 2>&1; then
-      MAKE=mingw32-make
-   else
-      if type gmake > /dev/null 2>&1; then
-         MAKE=gmake
-      else
-         MAKE=make
-      fi
-   fi
-fi
-
-
-if [ -z "$CC" ]; then
-   if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
-      CC=cc
-   elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
-      CC=mingw32-gcc
-   else
-      CC=gcc
-   fi
-fi
-
-if [ -z "$CXX" ]; then
-   if [ $FORMAT_COMPILER_TARGET = "osx" ]; then
-      CXX=c++
-      CXX11="clang++ -std=c++11 -stdlib=libc++"
-   elif uname -s | grep -i MINGW32 > /dev/null 2>&1; then
-      CXX=mingw32-g++
-      CXX11=mingw32-g++
-   else
-      CXX=g++
-      CXX11=g++
-   fi
-fi
-
-FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET
-echo "CC = $CC"
-echo "CXX = $CXX"
-echo "STRIP = $STRIP"
-
 . ${BASE_DIR}/libretro-build-common.sh
 
 mkdir -p "$RARCH_DIST_DIR"

From b892137c5957227ac4b6f63e6581d4be1a8ed585 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <iKarith@users.noreply.github.com>
Date: Mon, 2 Feb 2015 23:08:12 -0800
Subject: [PATCH 11/11] JOBS is always set before libretro-build-common.sh

---
 libretro-build-common.sh | 4 ----
 libretro-config.sh       | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 36449c84..7209a809 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -5,10 +5,6 @@ die() {
    #exit 1
 }
 
-if [ -z "$JOBS" ]; then
-   JOBS=7
-fi
-
 if [ "$HOST_CC" ]; then
    CC="${HOST_CC}-gcc"
    CXX="${HOST_CC}-g++"
diff --git a/libretro-config.sh b/libretro-config.sh
index 3bd295fe..bf953f59 100755
--- a/libretro-config.sh
+++ b/libretro-config.sh
@@ -94,7 +94,7 @@ config_cpu
 config_platform
 config_log_build_host
 
-if [ -z "$JOBS" ]; then
+if [ -z "${JOBS}" ]; then
    if command -v nproc >/dev/null; then
       JOBS=`nproc`
    else