[patch] integrated emerge-webrsync.patch

patch (text/plain), 2.51 KB, created by Brian Harring (RETIRED) on 2004-08-01 04:57:00 UTC

Index: emerge-webrsync
===================================================================
RCS file: /var/cvsroot/gentoo-src/portage/bin/emerge-webrsync,v
retrieving revision 1.4
diff -u -b -B -u -r1.4 emerge-webrsync
--- emerge-webrsync	17 May 2004 04:21:21 -0000	1.4
+++ emerge-webrsync	1 Aug 2004 11:54:17 -0000
@@ -7,14 +7,14 @@
 
 GENTOO_MIRRORS="$(/usr/lib/portage/bin/portageq gentoo_mirrors)"
 PORTDIR="$(/usr/lib/portage/bin/portageq portdir)"
-syncpath="/var/tmp/emerge-webrsync"
+FETCHCOMMAND="$(/usr/lib/portage/bin/portageq envvar FETCHCOMMAND)"
+USERLAND="$(/usr/lib/portage/bin/portageq envvar USERLAND)"
+DISTDIR="/var/tmp/emerge-webrsync"
 
-if [ ! -d $syncpath ] ; then
-	mkdir -p $syncpath
+if [ ! -d $DISTDIR ] ; then
+	mkdir -p $DISTDIR
 fi
 
-cd $syncpath
-
 found=0
 attempts=0
 download=1
@@ -21,7 +22,13 @@
 if [ "$1" == "-v" ] ; then
 	wgetops=
 else	
+	#this sucks.  probably better to do 1> /dev/null
+	#that said, waiting on the refactoring.
+	if [ "${FETCHCOMMAND/wget}" == "${FETCHCOMMAND}" ]; then
 	wgetops=-q
+	elif [ "${FETCHCOMMAND/curl}" == "${FETCHCOMMAND}" ]; then
+		wgetops=-s
+	fi
 fi
 
 if [ "$1" == "-n" ] ; then
@@ -33,7 +40,7 @@
 	tar jxf $file
 	rm -f $file
 	# Make sure user and group file ownership is root
-	chown -R root:root portage
+	chown -R 0:0 portage
 	cd portage
 	rsync -av --progress --stats --delete --delete-after \
 	--exclude='distfiles/*' --exclude='packages/*' . ${PORTDIR%%/}
@@ -45,22 +52,30 @@
 
 while (( $attempts <  40 )) ; do
 
-	day=`date -d "-$attempts day" +"%d"`
-	month=`date -d "-$attempts day" +"%m"`
-	year=`date -d "-$attempts day" +"%Y"`
+	#this too, sucks.  it works in the interim though.
+	if [ "$USERLAND" == "BSD" ] ; then
+		daysbefore=$(expr $(date +"%s") - 86400 \* $attempts)
+		day=$(date -r $daysbefore +"%d")
+		month=$(date -r $daysbefore +"%m")
+		year=$(date -r $daysbefore +"%Y")
+	else
+		day=$(date -d "-$attempts day" +"%d")
+		month=$(date -d "-$attempts day" +"%m")
+		year=$(date -d "-$attempts day" +"%Y")
+	fi
 
-	file="portage-${year}${month}${day}.tar.bz2"
+	FILE="portage-${year}${month}${day}.tar.bz2"
 
-	if [ -f $file ] && [ $download == 0 ] ; then
+	if [ -f $FILE ] && [ $download == 0 ] ; then
 		sync_local
 		exit 0
 	fi
 
 	for i in $GENTOO_MIRRORS ; do 
-		url="${i}/snapshots/$file"
+		URI="${i}/snapshots/$FILE"
 		rm -f $file
 		
-		if (wget $wgetops $url) && [ -s $file ] ; then
+		if (eval "$FETCHCOMMAND $wgetops") && [ -s $FILE ] ; then
 			sync_local
 			echo
 			echo " *** Completed websync, please now perform a normal rsync if possible."