--- trunk/mage-buildserver/runme.sh	2014/08/14 14:32:30	2756
+++ trunk/mage-buildserver/runme.sh	2014/08/28 07:40:16	2757
@@ -12,11 +12,14 @@
 source ${MLIBDIR}/mage4.functions.sh
 source ${MLIBDIR}/smage2.functions.sh
 
+BUILDSERVER_CONFIG_DIR="/etc/mage-buildserver"
+source ${BUILDSERVER_CONFIG_DIR}/buildserver.conf
+
 REL_SMAGEFILE="$1"
 SVN_HOME="/home/tjoke/svn/smage/trunk"
 SMAGEFILE="${SVN_HOME}/${REL_SMAGEFILE}"
 
-if [[ -z ${SMAGEFILE} ]]
+if [[ -z ${REL_SMAGEFILE} ]]
 then
 	echo "No smagefile given."
 	exit 1
@@ -46,14 +49,14 @@
 CURPBUILD=$(magename2pbuild $(basename $1 .smage2))
 CURDISTROTAG=$(print_distrotag)
 
-echo "debug: SMAGEDIR='${SMAGEDIR}'"
-echo "debug: MD5DIR='${MD5DIR}'"
-echo "debug: MD5NAME='${MD5NAME}'"
-echo "debug: SMAGENAME='${SMAGENAME}'"
-echo "debug: CURPNAME='${CURPNAME}'"
-echo "debug: CURPVER='${CURPVER}'"
-echo "debug: CURPBUILD='${CURPBUILD}'"
-echo "debug: CURDISTROTAG='${CURDISTROTAG}'"
+#echo "debug: SMAGEDIR='${SMAGEDIR}'"
+#echo "debug: MD5DIR='${MD5DIR}'"
+#echo "debug: MD5NAME='${MD5NAME}'"
+#echo "debug: SMAGENAME='${SMAGENAME}'"
+#echo "debug: CURPNAME='${CURPNAME}'"
+#echo "debug: CURPVER='${CURPVER}'"
+#echo "debug: CURPBUILD='${CURPBUILD}'"
+#echo "debug: CURDISTROTAG='${CURDISTROTAG}'"
 
 # delete md5 if exist
 [[ -f ${MD5DIR}/${MD5NAME} ]] && rm ${MD5DIR}/${MD5NAME}
@@ -70,11 +73,11 @@
 svn commit -m "${SVN_COMMIT}" ../${CURPNAME} ${SMAGENAME} md5 md5/${MD5NAME}
 
 # update svn repos
-${sudo} /usr/lib/mage-buildserver/buildserver-svn.sh || die "svn update"
+${sudo} ${BUILDSERVER_LIB_DIR}/buildserver-svn.sh || die "svn update"
 
 # compile smage
-${sudo} /usr/lib/mage-buildserver/buildserver-compile-smage.sh ${REL_SMAGEFILE} || die "compile"
+${sudo} ${BUILDSERVER_LIB_DIR}/buildserver-compile-smage.sh ${REL_SMAGEFILE} || die "compile"
 
 # upload packages
-${sudo} /usr/lib/mage-buildserver/buildserver-upload-smage.sh ${REL_SMAGEFILE} || die "upload"
+${sudo} ${BUILDSERVER_LIB_DIR}/buildserver-upload-smage.sh ${REL_SMAGEFILE} || die "upload"