X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b8a41d9b792b4e97cc2344ae7cf61b378f4db0d4..f1526debb190c82b0c8a05b58a73af1963ab3646:/scripts/feeds.sh

diff --git a/scripts/feeds.sh b/scripts/feeds.sh
index a16b212c8..d44242069 100755
--- a/scripts/feeds.sh
+++ b/scripts/feeds.sh
@@ -22,33 +22,33 @@ cd $TOPDIR
 
 # Some functions we might call several times a run
 delete_symlinks() {
-	find $1 -type l | xargs rm -f
+	find $1 -type l | xargs -r rm -f
 }
 
 setup_symlinks() {
 	# We assume that feeds do reproduce the hierarchy : section/package
 	# so that we can make this structure be flat in $PACKAGE_DIR
-	for dir in $(ls $2/)
+	for dir in $(ls $1/)
 	do
-		ln -s $2/$dir/*/* $1/
+		ln -s $1/$dir/* $2/
 	done
 }
 
 checkout_feed() {
 	# We ensure the feed has not already been checked out, if so, we just update the source feed
 	if [ -d $FEEDS_DIR/$2 ]; then
-		svn update $FEEDS_DIR/$2
+		svn up ${3:+-r$3} $FEEDS_DIR/$2
 		echo "Updated to revision $(LANG=C svn info $FEEDS_DIR/$2 | awk '/^Revision:/ { print $2 }' )";
 	# Otherwise, we have to checkout in the $FEEDS_DIR 
 	else
-		svn co $1 $FEEDS_DIR/$2
+		svn co ${3:+-r$3} $1 $FEEDS_DIR/$2
 		echo "Checked out revision $(LANG=C svn info $FEEDS_DIR/$2 | awk '/^Revision:/ { print $2 }' )";
 	fi
 }
 
 extract_feed_name() {
 	# We extract the last name of the URL, maybe we should rename this as domain.tld.repository.name
-	echo "$(echo $1 | awk -F/ '{ print $NF}')"
+	echo "$(echo $1 | sed -e "s/[^A-Za-z\.]\+/_/g")"
 }
 
 # We can delete symlinks every time we start this script, since modifications have been made in the $FEEDS_DIR anyway
@@ -57,7 +57,7 @@ delete_symlinks "$PACKAGE_DIR"
 for feed in $1
 do
 	name=$(extract_feed_name "$feed")
-	checkout_feed "$feed" "$name"
+	checkout_feed "$feed" "$name" "$2"
 done
 # Finally setup symlinks
 setup_symlinks "$FEEDS_DIR" "$PACKAGE_DIR"