diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 1669ce93..fbf52b1d 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -20,7 +20,7 @@ while read line; do
 	KEY=`echo $line | cut --fields=1 --delimiter=" "`
 	VALUE=`echo $line | cut --fields=2 --delimiter=" "`
 
-	if [ "${KEY}" == "PATH" ]; then
+	if [ "${KEY}" = "PATH" ]; then
 		export PATH=${VALUE}:${ORIGPATH}
 		echo New PATH: $PATH
 
@@ -68,7 +68,7 @@ fi
 
 mkdir -v -p "$RARCH_DIST_DIR"
 
-if [ "${PLATFORM}" == "android" ]; then
+if [ "${PLATFORM}" = "android" ]; then
 
 	IFS=' ' read -ra ABIS <<< "$TARGET_ABIS"
 	for a in "${ABIS[@]}"; do
@@ -193,7 +193,7 @@ build_libretro_generic_makefile() {
 	cd $DIR
 	cd $SUBDIR
 
-	if [ "${NAME}" == "mame078" ]; then
+	if [ "${NAME}" = "mame078" ]; then
 		OLDJ=$JOBS
 		JOBS=1
 	fi
@@ -216,7 +216,7 @@ build_libretro_generic_makefile() {
 		echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}"
 		${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}
 	else
-		if [ "${NAME}" == "mame2010" ]; then
+		if [ "${NAME}" = "mame2010" ]; then
 
 			echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools
 			${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools
@@ -454,7 +454,7 @@ build_libretro_bsnes() {
 		rm -f out/*.{o,"${FORMAT_EXT}"}	
 
 
-		if [ "${PROFILE}" == "cpp98" -o "${PROFILE}" == "bnes" ]; then
+		if [ "${PROFILE}" = "cpp98" -o "${PROFILE}" = "bnes" ]; then
 			${MAKE} clean
 		fi
 
@@ -469,9 +469,9 @@ build_libretro_bsnes() {
 	echo "compiling..."
 
 
-	if [ "${PROFILE}" == "cpp98" ]; then
+	if [ "${PROFILE}" = "cpp98" ]; then
 		${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}"
-	elif [ "${PROFILE}" == "bnes" ]; then
+	elif [ "${PROFILE}" = "bnes" ]; then
 		echo "build command: ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler=${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET}
 		${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler="${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET}
 	else
@@ -481,9 +481,9 @@ build_libretro_bsnes() {
 
 	if [ $? -eq 0 ]; then
 		MESSAGE="$1 build successful ($jobid)"
-		if [ "${PROFILE}" == "cpp98" ]; then
+		if [ "${PROFILE}" = "cpp98" ]; then
 			cp -fv "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
-		elif [ "${PROFILE}" == "bnes" ]; then
+		elif [ "${PROFILE}" = "bnes" ]; then
 			cp -fv "libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
 		else
 			cp -fv "out/${NAME}_libretro$FORMAT.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
@@ -514,7 +514,7 @@ while read line; do
 	MAKEFILE=`echo $line | cut --fields=7 --delimiter=" "`
 	SUBDIR=`echo $line | cut --fields=8 --delimiter=" "`
 
-	if [ "${ENABLED}" == "YES" ]; then
+	if [ "${ENABLED}" = "YES" ]; then
 		echo "BUILDBOT JOB: $jobid Processing $NAME"
 		echo
 		echo URL: $URL
@@ -564,7 +564,7 @@ while read line; do
 		echo
 		echo
 
-		if [ "${TYPE}" == "PROJECT" ]; then
+		if [ "${TYPE}" = "PROJECT" ]; then
 			if [ -d "${DIR}/.git" ]; then
 
 				cd $DIR
@@ -576,17 +576,17 @@ while read line; do
 					BUILD="YES"
 				fi
 
-				if [ "${PREVCORE}" == "bsnes" -a "${PREVBUILD}" == "YES" -a "${COMMAND}" == "BSNES" ]; then
+				if [ "${PREVCORE}" = "bsnes" -a "${PREVBUILD}" = "YES" -a "${COMMAND}" = "BSNES" ]; then
 					FORCE="YES"
 					BUILD="YES"
 				fi
 
-				if [ "${PREVCORE}" == "mame" -a "${PREVBUILD}" == "YES" -a "${NAME}" == "mess" ]; then
+				if [ "${PREVCORE}" = "mame" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "mess" ]; then
 					FORCE="YES"
 					BUILD="YES"
 				fi
 
-				if [ "${PREVCORE}" == "mess" -a "${PREVBUILD}" == "YES" -a "${NAME}" == "ume" ]; then
+				if [ "${PREVCORE}" = "mess" -a "${PREVBUILD}" = "YES" -a "${NAME}" = "ume" ]; then
 					FORCE="YES"
 					BUILD="YES"
 				fi
@@ -599,7 +599,7 @@ while read line; do
 				git clone --depth=1 "$URL" "$DIR"
 				BUILD="YES"
 			fi
-		elif [ "${TYPE}" == "psp_hw_render" ]; then
+		elif [ "${TYPE}" = "psp_hw_render" ]; then
 			if [ -d "${DIR}/.git" ]; then
 
 				cd $DIR
@@ -644,21 +644,21 @@ while read line; do
 		cd ..
 		fi
 
-		if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
+		if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
 			echo building core...
-			if [ "${COMMAND}" == "GENERIC" ]; then
+			if [ "${COMMAND}" = "GENERIC" ]; then
 				build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
-			elif [ "${COMMAND}" == "GENERIC_GL" ]; then
+			elif [ "${COMMAND}" = "GENERIC_GL" ]; then
 				build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
-			elif [ "${COMMAND}" == "GENERIC_ALT" ]; then
+			elif [ "${COMMAND}" = "GENERIC_ALT" ]; then
 				build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
-			elif [ "${COMMAND}" == "GENERIC_JNI" ]; then
+			elif [ "${COMMAND}" = "GENERIC_JNI" ]; then
 				build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
-			elif [ "${COMMAND}" == "BSNES_JNI" ]; then
+			elif [ "${COMMAND}" = "BSNES_JNI" ]; then
 				build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
-			elif [ "${COMMAND}" == "GENERIC_THEOS" ]; then
+			elif [ "${COMMAND}" = "GENERIC_THEOS" ]; then
 				build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
-			elif [ "${COMMAND}" == "BSNES" ]; then
+			elif [ "${COMMAND}" = "BSNES" ]; then
 				build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11}
 			fi
 		else
@@ -679,7 +679,7 @@ echo
 cd $WORK
 BUILD=""
 
-if [ "${PLATFORM}" == "android" ] && [ "${RA}" == "YES" ]; then
+if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then
 
 	while read line; do
 
@@ -690,7 +690,7 @@ if [ "${PLATFORM}" == "android" ] && [ "${RA}" == "YES" ]; then
 		ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
 		PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
 
-		if [ "${ENABLED}" == "YES" ]; then
+		if [ "${ENABLED}" = "YES" ]; then
 			echo "BUILDBOT JOB: $jobid Processing $NAME"
 			echo 
 			echo NAME: $NAME
@@ -742,7 +742,7 @@ if [ "${PLATFORM}" == "android" ] && [ "${RA}" == "YES" ]; then
 				echo "pulling from repo... "
 				OUT=`git pull`
 				echo $OUT
-				if [ "${TYPE}" == "PROJECT" ]; then
+				if [ "${TYPE}" = "PROJECT" ]; then
 					RADIR=$DIR
 					if [[ $OUT == *"Already up-to-date"* ]]; then
 						BUILD="NO"
@@ -757,7 +757,7 @@ if [ "${PLATFORM}" == "android" ] && [ "${RA}" == "YES" ]; then
 				cd $PARENTDIR
 				git clone "$URL" "$DIR" --depth=1
 				cd $DIR
-				if [ "${TYPE}" == "PROJECT" ]; then
+				if [ "${TYPE}" = "PROJECT" ]; then
 					BUILD="YES"
 					RADIR=$DIR
 
@@ -769,7 +769,7 @@ if [ "${PLATFORM}" == "android" ] && [ "${RA}" == "YES" ]; then
 		echo
 		echo
 	done < $1.ra
-	if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
+	if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
 		echo "BUILDBOT JOB: $jobid Compiling Shaders"
 		echo 
 
@@ -819,7 +819,7 @@ if [ "${PLATFORM}" == "android" ] && [ "${RA}" == "YES" ]; then
 
 fi
 
-if [ "${PLATFORM}" == "theos_ios" ] && [ "${RA}" == "YES" ]; then
+if [ "${PLATFORM}" = "theos_ios" ] && [ "${RA}" = "YES" ]; then
 
 	while read line; do
 
@@ -830,7 +830,7 @@ if [ "${PLATFORM}" == "theos_ios" ] && [ "${RA}" == "YES" ]; then
 		ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
 		PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
 
-		if [ "${ENABLED}" == "YES" ]; then
+		if [ "${ENABLED}" = "YES" ]; then
 			echo "BUILDBOT JOB: $jobid Processing $NAME"
 			echo 
 			echo NAME: $NAME
@@ -882,7 +882,7 @@ if [ "${PLATFORM}" == "theos_ios" ] && [ "${RA}" == "YES" ]; then
 				echo "pulling from repo... "
 				OUT=`git pull`
 				echo $OUT
-				if [ "${TYPE}" == "PROJECT" ]; then
+				if [ "${TYPE}" = "PROJECT" ]; then
 					RADIR=$DIR
 					if [[ $OUT == *"Already up-to-date"* ]]; then
 						BUILD="NO"
@@ -897,7 +897,7 @@ if [ "${PLATFORM}" == "theos_ios" ] && [ "${RA}" == "YES" ]; then
 				cd $PARENTDIR
 				git clone "$URL" "$DIR" --depth=1
 				cd $DIR
-				if [ "${TYPE}" == "PROJECT" ]; then
+				if [ "${TYPE}" = "PROJECT" ]; then
 					BUILD="YES"
 					RADIR=$DIR
 
@@ -909,7 +909,7 @@ if [ "${PLATFORM}" == "theos_ios" ] && [ "${RA}" == "YES" ]; then
 		echo
 		echo
 	done < $1.ra
-	if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
+	if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
 		echo "BUILDBOT JOB: $jobid Compiling Shaders"
 		echo 
 
@@ -944,7 +944,7 @@ if [ "${PLATFORM}" == "theos_ios" ] && [ "${RA}" == "YES" ]; then
 
 fi
 
-if [ "${PLATFORM}" == "MINGW64" ] || [ "${PLATFORM}" == "MINGW32" ] && [ "${RA}" == "YES" ]; then
+if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = "YES" ]; then
 
 	while read line; do
 
@@ -955,7 +955,7 @@ if [ "${PLATFORM}" == "MINGW64" ] || [ "${PLATFORM}" == "MINGW32" ] && [ "${RA}"
 		ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
 		PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
 
-		if [ "${ENABLED}" == "YES" ]; then
+		if [ "${ENABLED}" = "YES" ]; then
 			echo "BUILDBOT JOB: $jobid Processing $NAME"
 			echo 
 			echo NAME: $NAME
@@ -1008,7 +1008,7 @@ if [ "${PLATFORM}" == "MINGW64" ] || [ "${PLATFORM}" == "MINGW32" ] && [ "${RA}"
 			echo "pulling from repo... "
 			OUT=`git pull`
 			echo $OUT
-			if [ "${TYPE}" == "PROJECT" ]; then
+			if [ "${TYPE}" = "PROJECT" ]; then
 				RADIR=$DIR
 				if [[ $OUT == *"Already up-to-date"* ]]; then
 					BUILD="NO"
@@ -1023,7 +1023,7 @@ if [ "${PLATFORM}" == "MINGW64" ] || [ "${PLATFORM}" == "MINGW32" ] && [ "${RA}"
 			git clone "$URL" "$DIR" --depth=1
 			cd $DIR
 	
-			if [ "${TYPE}" == "PROJECT" ]; then
+			if [ "${TYPE}" = "PROJECT" ]; then
 				BUILD="YES"
 				RADIR=$DIR
 
@@ -1035,7 +1035,7 @@ if [ "${PLATFORM}" == "MINGW64" ] || [ "${PLATFORM}" == "MINGW32" ] && [ "${RA}"
 	echo
 	echo
 	done < $1.ra
-	if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
+	if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
 
 		cd $RADIR
 		echo "BUILDBOT JOB: $jobid Building"
@@ -1169,7 +1169,7 @@ EOF
 
 fi
 
-if [ "${PLATFORM}" == "psp1" ] && [ "${RA}" == "YES" ]; then
+if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
 
 	while read line; do
 
@@ -1180,7 +1180,7 @@ if [ "${PLATFORM}" == "psp1" ] && [ "${RA}" == "YES" ]; then
 		ENABLED=`echo $line | cut --fields=5 --delimiter=" "`
 		PARENTDIR=`echo $line | cut --fields=6 --delimiter=" "`
 
-		if [ "${ENABLED}" == "YES" ]; then
+		if [ "${ENABLED}" = "YES" ]; then
 			echo "BUILDBOT JOB: $jobid Processing $NAME"
 			echo 
 			echo NAME: $NAME
@@ -1232,7 +1232,7 @@ if [ "${PLATFORM}" == "psp1" ] && [ "${RA}" == "YES" ]; then
 			echo "pulling from repo... "
 			OUT=`git pull`
 			echo $OUT
-			if [ "${TYPE}" == "PROJECT" ]; then
+			if [ "${TYPE}" = "PROJECT" ]; then
 				RADIR=$DIR
 				if [[ $OUT == *"Already up-to-date"* ]]; then
 					BUILD="NO"
@@ -1247,7 +1247,7 @@ if [ "${PLATFORM}" == "psp1" ] && [ "${RA}" == "YES" ]; then
 			git clone "$URL" "$DIR" --depth=1
 			cd $DIR
 	
-			if [ "${TYPE}" == "PROJECT" ]; then
+			if [ "${TYPE}" = "PROJECT" ]; then
 				BUILD="YES"
 				RADIR=$DIR
 
@@ -1259,14 +1259,14 @@ if [ "${PLATFORM}" == "psp1" ] && [ "${RA}" == "YES" ]; then
 	echo
 	echo
 	done < $1.ra
-	if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
+	if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
 
 		cd $RADIR
 		rm -rfv psp1/pkg
 		echo "BUILDBOT JOB: $jobid Building"
 		echo 
 
-		if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
+		if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
 
 			cd dist-scripts
 			rm *.a
diff --git a/libretro-buildbot-task.sh b/libretro-buildbot-task.sh
index 5c17a750..d41a9ae7 100755
--- a/libretro-buildbot-task.sh
+++ b/libretro-buildbot-task.sh
@@ -25,7 +25,7 @@ while read line; do
 	KEY=`echo $line | cut --fields=1 --delimiter=" "`
 	VALUE=`echo $line | cut --fields=2 --delimiter=" "`
 
-	if [ "${KEY}" == "PATH" ]; then
+	if [ "${KEY}" = "PATH" ]; then
 		export PATH=${VALUE}:${ORIGPATH}
 		echo New PATH: $PATH
 
@@ -73,7 +73,7 @@ fi
 
 mkdir -v -p "$RARCH_DIST_DIR"
 
-if [ "${PLATFORM}" == "android" ]; then
+if [ "${PLATFORM}" = "android" ]; then
 
 	IFS=' ' read -ra ABIS <<< "$TARGET_ABIS"
 	for a in "${ABIS[@]}"; do
@@ -196,7 +196,7 @@ build_libretro_generic_makefile() {
 	cd $DIR
 	cd $SUBDIR
 
-	if [ "${NAME}" == "mame078" ]; then
+	if [ "${NAME}" = "mame078" ]; then
 		OLDJ=$JOBS
 		JOBS=1
 	fi
@@ -219,7 +219,7 @@ build_libretro_generic_makefile() {
 		echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}"
 		${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS}
 	else
-		if [ "${NAME}" == "mame2010" ]; then
+		if [ "${NAME}" = "mame2010" ]; then
 
 			echo "build command: ${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS}" buildtools
 			${MAKE} -f ${MAKEFILE} platform=${PLATFORM} -j${JOBS} ${ARGS} buildtools
@@ -457,7 +457,7 @@ build_libretro_bsnes() {
 		rm -f out/*.{o,"${FORMAT_EXT}"}	
 
 
-		if [ "${PROFILE}" == "cpp98" -o "${PROFILE}" == "bnes" ]; then
+		if [ "${PROFILE}" = "cpp98" -o "${PROFILE}" = "bnes" ]; then
 			${MAKE} clean
 		fi
 
@@ -472,9 +472,9 @@ build_libretro_bsnes() {
 	echo "compiling..."
 
 
-	if [ "${PROFILE}" == "cpp98" ]; then
+	if [ "${PROFILE}" = "cpp98" ]; then
 		${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}"
-	elif [ "${PROFILE}" == "bnes" ]; then
+	elif [ "${PROFILE}" = "bnes" ]; then
 		echo "build command: ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler=${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET}
 		${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler="${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET}
 	else
@@ -484,9 +484,9 @@ build_libretro_bsnes() {
 
 	if [ $? -eq 0 ]; then
 		MESSAGE="$1 build successful ($jobid)"
-		if [ "${PROFILE}" == "cpp98" ]; then
+		if [ "${PROFILE}" = "cpp98" ]; then
 			cp -fv "out/libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
-		elif [ "${PROFILE}" == "bnes" ]; then
+		elif [ "${PROFILE}" = "bnes" ]; then
 			cp -fv "libretro.${FORMAT_EXT}" "${RARCH_DIST_DIR}/${NAME}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}"
 		else
 			cp -fv "out/${NAME}_libretro$FORMAT.${FORMAT_EXT}" $RARCH_DIST_DIR/${NAME}_${PROFILE}_libretro${FORMAT}${SUFFIX}.${FORMAT_EXT}
@@ -533,7 +533,7 @@ while read line; do
 	fi
 
 
-	if [ "${ENABLED}" == "YES" ]; then
+	if [ "${ENABLED}" = "YES" ]; then
 		echo "BUILDBOT JOB: $jobid Processing $NAME"
 		echo
 		echo URL: $URL
@@ -584,21 +584,21 @@ while read line; do
 		echo
 		echo
 
-		if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
+		if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
 			echo building core...
-			if [ "${COMMAND}" == "GENERIC" ]; then
+			if [ "${COMMAND}" = "GENERIC" ]; then
 				build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
-			elif [ "${COMMAND}" == "GENERIC_GL" ]; then
+			elif [ "${COMMAND}" = "GENERIC_GL" ]; then
 				build_libretro_generic_gl_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET} "${ARGS}"
-			elif [ "${COMMAND}" == "GENERIC_ALT" ]; then
+			elif [ "${COMMAND}" = "GENERIC_ALT" ]; then
 				build_libretro_generic_makefile $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
-			elif [ "${COMMAND}" == "GENERIC_JNI" ]; then
+			elif [ "${COMMAND}" = "GENERIC_JNI" ]; then
 				build_libretro_generic_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
-			elif [ "${COMMAND}" == "BSNES_JNI" ]; then
+			elif [ "${COMMAND}" = "BSNES_JNI" ]; then
 				build_libretro_bsnes_jni $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
-			elif [ "${COMMAND}" == "GENERIC_THEOS" ]; then
+			elif [ "${COMMAND}" = "GENERIC_THEOS" ]; then
 				build_libretro_generic_theos $NAME $DIR $SUBDIR $MAKEFILE ${FORMAT_COMPILER_TARGET_ALT} "${ARGS}"
-			elif [ "${COMMAND}" == "BSNES" ]; then
+			elif [ "${COMMAND}" = "BSNES" ]; then
 				build_libretro_bsnes $NAME $DIR "${ARGS}" $MAKEFILE ${FORMAT_COMPILER_TARGET} ${CXX11}
 			fi
 		else
@@ -625,7 +625,7 @@ if [ ! -z "$TASK" ]; then
 	fi
 fi
 
-if [ "${PLATFORM}" == "MINGW64" ] || [ "${PLATFORM}" == "MINGW32" ] && [ "${RA}" == "YES" ]; then
+if [ "${PLATFORM}" = "MINGW64" ] || [ "${PLATFORM}" = "MINGW32" ] && [ "${RA}" = "YES" ]; then
 
 	while read line; do
 
@@ -641,7 +641,7 @@ if [ "${PLATFORM}" == "MINGW64" ] || [ "${PLATFORM}" == "MINGW32" ] && [ "${RA}"
 				continue
 			fi
 		fi 
-		if [ "${ENABLED}" == "YES" ]; then
+		if [ "${ENABLED}" = "YES" ]; then
 			echo "BUILDBOT JOB: $jobid Processing $NAME"
 			echo 
 			echo NAME: $NAME
@@ -692,7 +692,7 @@ if [ "${PLATFORM}" == "MINGW64" ] || [ "${PLATFORM}" == "MINGW32" ] && [ "${RA}"
 	echo
 	echo
 	done < $1.ra
-	if [ "${BUILD}" == "YES" -o "${FORCE}" == "YES" ]; then
+	if [ "${BUILD}" = "YES" -o "${FORCE}" = "YES" ]; then
 
 		cd $3
 		echo "BUILDBOT JOB: $jobid Building"