--- trunk/mage-buildserver/buildserver-upload-smage.sh	2014/08/10 19:38:18	2733
+++ trunk/mage-buildserver/buildserver-upload-smage.sh	2014/08/28 09:04:24	2771
@@ -27,9 +27,6 @@
 	echo "PKG_SCP_REPO=\"${PKG_SCP_REPO}\"" >> ${BUILDROOT}/${arch}/.runrc
 	echo "BUILD_ARCH=\"${arch}\"" >> ${BUILDROOT}/${arch}/.runrc
 cat >> ${BUILDROOT}/${arch}/.runrc << "EOF"
-env-rebuild
-source /etc/profile
-
 if [ -f /etc/rc.d/init.d/functions ]
 then
 	source /etc/rc.d/init.d/functions
@@ -61,6 +58,9 @@
 	die "${MLIBDIR}/smage2.functions.sh not found"
 fi
 
+env-rebuild
+source /etc/profile
+
 # override die function
 die()
 {
@@ -71,11 +71,11 @@
 load_mage_features
 mage_setup
 
-if [ -f /var/cache/mage/smage/${SMAGEFILE} ]
+if [ -f ${SMAGESCRIPTSDIR}/${SMAGEFILE} ]
 then
-	smagesource /var/cache/mage/smage/${SMAGEFILE}
+	smagesource ${SMAGESCRIPTSDIR}/${SMAGEFILE}
 else
-	die "smagefile '/var/cache/mage/smage/${SMAGEFILE}' not found."
+	die "smagefile '${SMAGESCRIPTSDIR}/${SMAGEFILE}' not found."
 fi
 
 if [[ ${BUILD_ARCH} = src ]]
@@ -101,7 +101,7 @@
 			export PNAME="${subpackage}"
 			split_info_${PNAME}
 
-			TARGET_PKGFILE+=( "/var/cache/mage/packages/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )
+			TARGET_PKGFILE+=( "${PKGDIR}/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )
 
 			# restore smage environment
 			split_restore_variables
@@ -109,7 +109,7 @@
 		# unset all saved smage variables
 		split_unset_variables
 	else
-		TARGET_PKGFILE=( "/var/cache/mage/packages/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )
+		TARGET_PKGFILE=( "${PKGDIR}/${PNAME}-${PVER}-${BUILD_ARCH}$(print_distrotag)-${PBUILD}.${PKGSUFFIX}" )
 	fi
 
 	for i in ${TARGET_PKGFILE}