Commits

Moises Henriquez committed 03fb066

Fixed build-pusher paths determination

Comments (0)

Files changed (1)

slave/usr/local/bin/build-pusher

 
 # Source the settings defined in /tmp/buildbot/vectorlinux/slave.conf
 #source /tmp/buildbot/vectorlinux/slave.conf
-source /etc/vlbuildslave/slavehost.conf
+source /etc/vlbuildslave/slavehost.conf || exit 1
 
-BUILDER=${1}
-JAIL=${2}
+BUILDER=$1
+JAIL=$2
 USE_CHROOT=${CHROOTS[$JAIL]}
 VLVER=$(arg_vlrelease $JAIL)
-#VLVER=$(echo $JAIL | cut -c 3-)
-
-if [[ ${BUILDER} == *~x86_64 ]]; then
-        pooldir="x86_64"
-        APPNAME=$(echo ${BUILDER} | cut -f 1 -d "~")
-else
-        USE_CHROOT=${CHROOT32}
-        APPNAME=${BUILDER}
-        pooldir="x86"
-fi
+ARCH=$(arg_arch $JAIL)
+
+case "$ARCH" in 
+	64 )
+		pooldir="x86_64"
+		APPNAME=$(echo ${BUILDER} | cut -f 1 -d "~")
+		;;
+	32 )
+		pooldir="x86"
+		APPNAME=${BUILDER}
+		;;
+esac
 
 WORKPATH=${USE_CHROOT}/CHROOT-RWSB.${BUILDER}
 WORKDIR=${WORKPATH}/tmp/builds
 	norun=$(grep "NORUN" $SB )
 if [ "x$norun" = "x" ]; then
     # unable to source this
-    echo "Unable to source $SB without running it"
+    echo " - Unable to source $SB without running it.  We'll have to upload sources"
 
 else
 #	echo "test echo "