--- trunk/pkgtools/add2cvs.sh	2007/11/11 23:40:52	610
+++ trunk/pkgtools/add2cvs.sh	2008/04/13 20:43:16	718
@@ -3,7 +3,12 @@
 source /usr/lib/mage/mage4.functions.sh
 
 SMAGEFILE="$1"
-[[ -n $2 ]] && CVS_COMMIT="$2"
+[[ -n $2 ]] && [[ $2 != -st ]] && CVS_COMMIT="$2"
+if [[ $3 = -st ]] || [[ $2 = -st ]]
+then
+	echo "Using SRCTARBALL ..."
+	USE_SRCTARBALL=true
+fi
 
 CURARCH=i686
 #CURARCH=x86_64
@@ -17,22 +22,52 @@
 CURPBUILD=$(magename2pbuild $(basename $1 .smage2))
 PKGNAME=${CURPNAME}-${CURPVER}-${CURARCH}-${CURPBUILD}.mpk
 SRCPKGNAME=${CURPNAME}-${CURPVER}-${CURPBUILD}.mpks
-SSHLOGIN="tjoke@62.141.57.200:/var/www/magellan/magellan-dev/unstable/packages"
+SSHLOGIN="tjoke@magellan-linux.de:/var/www/htdocs/magellan/magellan-dev/unstable/packages"
+SRCTARBALL_URI="http://magellan-linux.de/magellan/magellan-dev/unstable/packages/src"
+
+# abort if the package is already installed in BUILDROOT
+get_value_from_file()
+{
+	local var="$1"
+	local file="$2"
+	local value
+
+	# source /etc/mage.rc to get the includes right
+	source /etc/mage.rc.global
+	source /etc/mage.rc
+
+	# evaluate the value
+	source ${file} $> /dev/null
+	eval value=\$$(echo ${var})
+	echo "${value}"
+}
+
+CURPCATEGORIE=$(get_value_from_file PCATEGORIE ${SMAGEFILE})
+INSTALLDB_BUILDROOT=$(get_value_from_file INSTALLDB /mnt/BUILDROOT/etc/mage.rc)
+
+if [[ -d /mnt/BUILDROOT/${INSTALLDB_BUILDROOT}/${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD} ]]
+then
+	echo "Package '${CURPCATEGORIE}/${CURPNAME}-${CURPVER}-${CURPBUILD}' already installed in /mnt/BUILDROOT. Aborting!"
+	exit 1
+fi
 
 # delete md5 if exist
 [[ -f ${MD5DIR}/${MD5NAME} ]] && rm ${MD5DIR}/${MD5NAME}
 
-/sbin/smage2 download ${SMAGEFILE}
-/sbin/smage2 calcmd5 ${SMAGEFILE} ${MD5DIR}
-pushd ${SMAGEDIR}/../
-cvs add ${CURPNAME}
-pushd ${SMAGEDIR}
-cvs add md5
-cvs add ${SMAGENAME} md5/${MD5NAME}
-
-[[ -z ${CVS_COMMIT} ]] && CVS_COMMIT="auto added: ver bump to ${CURPVER}-${CURPBUILD}"
-cvs commit -m "${CVS_COMMIT}" ${SMAGENAME} md5/${MD5NAME}
-popd
+if [[ ${USE_SRCTARBALL} != true ]]
+then
+	/sbin/smage2 download ${SMAGEFILE}
+	/sbin/smage2 calcmd5 ${SMAGEFILE} ${MD5DIR}
+	pushd ${SMAGEDIR}/../
+	cvs add ${CURPNAME}
+	pushd ${SMAGEDIR}
+	cvs add md5
+	cvs add ${SMAGENAME} md5/${MD5NAME}
+
+	[[ -z ${CVS_COMMIT} ]] && CVS_COMMIT="auto added: ver bump to ${CURPVER}-${CURPBUILD}"
+	cvs commit -m "${CVS_COMMIT}" ${SMAGENAME} md5/${MD5NAME}
+	popd
+fi
 
 sudo -s << EOF
 :> /mnt/BUILDROOT/.installrc
@@ -51,7 +86,19 @@
 echo 'cd /var/cache/mage/smage' >> /mnt/BUILDROOT/.installrc
 echo 'cvs update include' >> /mnt/BUILDROOT/.installrc
 echo 'cvs update -dPA ${CURPNAME}' >> /mnt/BUILDROOT/.installrc
-echo '/sbin/smage2 /var/cache/mage/smage/${CURPNAME}/${SMAGENAME} || exit 1' >> /mnt/BUILDROOT/.installrc
+echo 'USE_SRCTARBALL=${USE_SRCTARBALL}' >> /mnt/BUILDROOT/.installrc
+echo 'if [[ \${USE_SRCTARBALL} != true ]];then '  >> /mnt/BUILDROOT/.installrc
+	echo '/sbin/smage2 /var/cache/mage/smage/${CURPNAME}/${SMAGENAME} || exit 1' >> /mnt/BUILDROOT/.installrc
+echo 'else'  >> /mnt/BUILDROOT/.installrc
+	echo 'echo "Fetching SRC_TARBALL"' >> /mnt/BUILDROOT/.installrc
+	echo 'pushd /var/tmp/magebuild > /dev/null' >> /mnt/BUILDROOT/.installrc
+	echo "SRCTARBALL=${CURPNAME}-${CURPVER}-${CURPBUILD}.mpks" >> /mnt/BUILDROOT/.installrc
+	echo "SRCTARBALL_URI=${SRCTARBALL_URI}" >> /mnt/BUILDROOT/.installrc
+	echo '/usr/bin/wget -c \${SRCTARBALL_URI}/\${SRCTARBALL}' >> /mnt/BUILDROOT/.installrc
+	echo '/sbin/smage2 -st \${SRCTARBALL}' >> /mnt/BUILDROOT/.installrc
+	echo '[[ -f \${SRCTARBALL} ]] && rm \${SRCTARBALL}' >> /mnt/BUILDROOT/.installrc
+	echo 'popd > /dev/null' >> /mnt/BUILDROOT/.installrc
+echo 'fi' >> /mnt/BUILDROOT/.installrc
 echo '/sbin/mage install ${CURPNAME} || exit 1' >> /mnt/BUILDROOT/.installrc
 echo 'mv /var/cache/mage/packages/${PKGNAME} /BUILDED' >> /mnt/BUILDROOT/.installrc
 echo 'mv /var/cache/mage/packages/sources/${SRCPKGNAME} /BUILDED/sources' >> /mnt/BUILDROOT/.installrc