Merge pull request #200 from iKarith/master

Shell quoting and libretro-upgrade.sh
This commit is contained in:
Twinaphex 2015-02-22 15:45:40 +11:00
commit 2d05ece496
4 changed files with 80 additions and 4 deletions

View File

@ -3,7 +3,7 @@
SCRIPT="${0#./}" SCRIPT="${0#./}"
BASE_DIR="${SCRIPT%/*}" BASE_DIR="${SCRIPT%/*}"
WORKDIR=$PWD WORKDIR="$PWD"
if [ "$BASE_DIR" = "$SCRIPT" ]; then if [ "$BASE_DIR" = "$SCRIPT" ]; then
BASE_DIR="$WORKDIR" BASE_DIR="$WORKDIR"

View File

@ -3,7 +3,7 @@
SCRIPT="${0#./}" SCRIPT="${0#./}"
BASE_DIR="${SCRIPT%/*}" BASE_DIR="${SCRIPT%/*}"
WORKDIR=$PWD WORKDIR="$PWD"
if [ "$BASE_DIR" = "$SCRIPT" ]; then if [ "$BASE_DIR" = "$SCRIPT" ]; then
BASE_DIR="$WORKDIR" BASE_DIR="$WORKDIR"
@ -14,7 +14,7 @@ else
fi fi
fi fi
. ${BASE_DIR}/libretro-config.sh . "$BASE_DIR/libretro-config.sh"
if [ -z "$RARCH_DIST_DIR" ]; then if [ -z "$RARCH_DIST_DIR" ]; then
RARCH_DIR="$WORKDIR/dist" RARCH_DIR="$WORKDIR/dist"

View File

@ -230,7 +230,8 @@ if [[ "$FORMAT_COMPILER_TARGET" = "osx" && -z "$NOUNIVERSAL" ]]; then
export ARCHFLAGS="-arch ppc -arch ppc64" export ARCHFLAGS="-arch ppc -arch ppc64"
;; ;;
*) *)
echo "Universal build requested with unknown ARCH=\"$ARCH\"" echo "Will not build universal binaries for unknown ARCH=\"$ARCH\""
;;
esac esac
fi fi

75
libretro-upgrade.sh Executable file
View File

@ -0,0 +1,75 @@
#! /usr/bin/env bash
# vim: set ts=3 sw=3 noet ft=sh : bash
SCRIPT="${0#./}"
BASE_DIR="${SCRIPT%/*}"
WORKDIR="$PWD"
if [ "$BASE_DIR" = "$SCRIPT" ]; then
BASE_DIR="$WORKDIR"
else
if [[ "$0" != /* ]]; then
# Make the path absolute
BASE_DIR="$WORKDIR/$BASE_DIR"
fi
fi
found_nothing=1
libretro_move_libretro_common() {
if [ -f "$WORKDIR/libretro-sdk/file/config_file.c" ]; then
found_nothing=""
echo ""
echo "=== Detected old libretro-sdk (now libretro-common)"
if [ -d "$WORKDIR/libretro-common" ]; then
echo " libretro-common already exists"
echo ""
echo -n " Would you like to delete libretro-sdk? [y/N] : "
read user
if [[ "$user" = "y" || "$user" == "Y" ]]; then
echo " Deleting libretro-sdk..."
rm -rf "$WORKDIR/libretro-sdk"
else
echo "Retaining libretro-sdk at your request."
fi
else
echo ""
echo " will move it"
mv "$WORKDIR/libretro-sdk" "$WORKDIR/libretro-common"
fi
fi
}
libretro_bsnes_one_copy() {
if [ -d "$WORKDIR/libretro-bsnes/perf" ]; then
found_nothing=""
echo ""
echo "=== Detected bsnes duplicates"
echo " libretro-super no longer needs three copies of bsnes"
echo ""
echo -n " Would you like to delete the extras? [y/N] : "
read user
if [[ "$user" = "y" || "$user" == "Y" ]]; then
echo " Deleting libretro-bsnes/balanced..."
rm -rf "$WORKDIR/libretro-bsnes/balanced"
echo " Deleting libretro-bsnes/perf..."
rm -rf "$WORKDIR/libretro-bsnes/perf"
else
echo " Retaining bsnes duplicates at your request."
fi
fi
}
if [ -n "$1" ]; then
while [ -n "$1" ]; do
"$1"
shift
done
else
libretro_move_libretro_common
libretro_bsnes_one_copy
fi
if [ -n "$found_nothing" ]; then
echo "Nothing to upgrade."
fi