diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 778bc342..45288a66 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -1685,7 +1685,7 @@ if [ "${PLATFORM}" = "psp1" ] && [ "${RA}" = "YES" ]; then
 		cp -v $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh psp1 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
-		if [ $? -eq 0 ]; then
+		if [ ${PIPESTATUS[0]} -eq 0 ]; then
 			MESSAGE="retroarch:	[status: done] [$jobid]"
 			curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/
 			touch $TMPDIR/built-frontend
@@ -1735,7 +1735,7 @@ if [ "${PLATFORM}" == "wii" ] && [ "${RA}" == "YES" ]; then
 		cp -v $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh wii 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
-		if [ $? -eq 0 ];
+		if [ ${PIPESTATUS[0]} -eq 0 ];
 		then
 			MESSAGE="retroarch:	[status: done] [$jobid]"
 			curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/
@@ -1788,7 +1788,7 @@ if [ "${PLATFORM}" == "wiiu" ] && [ "${RA}" == "YES" ]; then
 		cp -v ../media/assets/pkg/wiiu/*.png .
 
 		time sh ./wiiu-cores.sh 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
-		if [ $? -eq 0 ];
+		if [ ${PIPESTATUS[0]} -eq 0 ];
 		then
 			MESSAGE="retroarch:	[status: done] [$jobid]"
 			curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/
@@ -1832,7 +1832,7 @@ if [ "${PLATFORM}" == "ngc" ] && [ "${RA}" == "YES" ]; then
 		cp -v $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh ngc 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
-		if [ $? -eq 0 ];
+		if [ ${PIPESTATUS[0]} -eq 0 ];
 		then
 			MESSAGE="retroarch:	[status: done] [$jobid]"
 			curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/
@@ -1882,7 +1882,7 @@ if [ "${PLATFORM}" == "ctr" ] && [ "${RA}" == "YES" ]; then
 		cp -v $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh ctr 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
-		if [ $? -eq 0 ]; then
+		if [ ${PIPESTATUS[0]} -eq 0 ]; then
 			MESSAGE="retroarch:	[status: done] [$jobid]"
 			curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/
 			echo $MESSAGE
@@ -1951,7 +1951,7 @@ if [ "${PLATFORM}" == "vita" ] && [ "${RA}" == "YES" ]; then
 		cp -v $RARCH_DIST_DIR/arm/*.a .
 
 		time sh ./dist-cores.sh vita 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
-		if [ $? -eq 0 ]; then
+		if [ ${PIPESTATUS[0]} -eq 0 ]; then
 			MESSAGE="retroarch:	[status: done] [$jobid]"
 			curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/
 			echo $MESSAGE
@@ -2000,7 +2000,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then
 		cp -v $RARCH_DIST_DIR/*.a .
 
 		time sh ./dist-cores.sh dex-ps3 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}_dex.log
-		if [ $? -eq 0 ]; then
+		if [ ${PIPESTATUS[0]} -eq 0 ]; then
 			MESSAGE="retroarch:	[status: done] [$jobid]"
 			curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/
 			echo $MESSAGE
@@ -2017,7 +2017,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then
 		echo buildbot job: $MESSAGE
 		ENTRY_ID=`curl -X POST -d type="start" -d master_log="$MASTER_LOG_ID" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/`
 		time sh ./dist-cores.sh cex-ps3 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}_cex.log
-		if [ $? -eq 0 ]; then
+		if [ ${PIPESTATUS[0]} -eq 0 ]; then
 			MESSAGE="retroarch:	[status: done] [$jobid]"
 			curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/
 			echo $MESSAGE
@@ -2034,7 +2034,7 @@ if [ "${PLATFORM}" == "ps3" ] && [ "${RA}" == "YES" ]; then
 		echo buildbot job: $MESSAGE
 		ENTRY_ID=`curl -X POST -d type="start" -d master_log="$MASTER_LOG_ID" -d platform="$jobid" -d name="retroarch" http://buildbot.fiveforty.net/build_entry/`
 		time sh ./dist-cores.sh ode-ps3 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}_ode.log
-		if [ $? -eq 0 ]; then
+		if [ ${PIPESTATUS[0]} -eq 0 ]; then
 			MESSAGE="retroarch:	[status: done] [$jobid]"
 			curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/
 			echo $MESSAGE
@@ -2076,7 +2076,7 @@ if [ "${PLATFORM}" = "emscripten" ] && [ "${RA}" = "YES" ]; then
 
 		echo "BUILD CMD $HELPER ./dist-cores.sh emscripten" &> $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
 		$HELPER ./dist-cores.sh emscripten 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_RetroArch_${PLATFORM}.log
-		if [ $? -eq 0 ]; then
+		if [ ${PIPESTATUS[0]} -eq 0 ]; then
 			MESSAGE="retroarch:	[status: done] [$jobid]"
 			curl -X POST -d type="finish" -d index="$ENTRY_ID" -d status="done" http://buildbot.fiveforty.net/build_entry/
 			echo $MESSAGE