# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1488184733 28800
# Node ID 8e3adc6264d30e8c7902c359f79700c7ad2d4b1e
# Parent  f249fd91b0f5ef2d6040783e896f975fdf767654
Don't depend on USER being set in build_nightly as it does not seem to work when build job is run from cron

diff -r f249fd91b0f5 -r 8e3adc6264d3 build_nightly
--- a/build_nightly	Mon Feb 27 00:28:05 2017 -0800
+++ b/build_nightly	Mon Feb 27 00:38:53 2017 -0800
@@ -3,8 +3,9 @@
 set -e
 
 build_user=$1
-if [ $USER != $build_user ]; then
-	su $build_user -c "$0 $@";
+needsu=$2
+if [ "$needsu" = needsu ]; then
+	su $build_user -c "$0 $1";
 	exit
 fi
 
diff -r f249fd91b0f5 -r 8e3adc6264d3 build_upload_nightly
--- a/build_upload_nightly	Mon Feb 27 00:28:05 2017 -0800
+++ b/build_upload_nightly	Mon Feb 27 00:38:53 2017 -0800
@@ -9,12 +9,12 @@
 fi
 sleep 10
 echo Starting build by $BUILD_USER in $CONTAINER_NAME
-lxc-attach -n "$CONTAINER_NAME" -- /home/$BUILD_USER/blastem/build_nightly $BUILD_USER 2>&1 > /tmp/build_${name}_out.log
+lxc-attach -n "$CONTAINER_NAME" -- /home/$BUILD_USER/blastem/build_nightly $BUILD_USER needsu 2>&1 > /tmp/build_${name}_out.log
 result=$?
 if [ $result -ne 0 ]; then
 	echo Build falied with return code $result stopping $CONTAINER_NAME
 	lxc-stop -n "$CONTAINER_NAME"
-	exit $?
+	exit $result
 fi
 echo "Build succeeded, stopping $CONTAINER_NAME"
 lxc-stop -n "$CONTAINER_NAME"