X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/99ba699421c041858df7fcb50379e3b21798ae12..030c5d8f7ec690c8119cc3d28f910cf1a0278d53:/scripts/feeds.sh diff --git a/scripts/feeds.sh b/scripts/feeds.sh index a6d4ef9d7..d44242069 100755 --- a/scripts/feeds.sh +++ b/scripts/feeds.sh @@ -30,18 +30,18 @@ setup_symlinks() { # so that we can make this structure be flat in $PACKAGE_DIR for dir in $(ls $1/) do - ln -s $1/$dir/*/* $2/ + 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 up $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 } @@ -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"