X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=scripts%2Ffeeds.sh;h=d44242069d83849b4a8be8a08425cc780638e3fc;hb=8a854beb05f7954227e2d89ead0827529d972159;hp=351c87c43dd2ca70d8fda03c4b383cc4276f3970;hpb=3a8525a17a75d475824ae22e56b49c7ff882d386;p=openwrt-10.03%2F.git diff --git a/scripts/feeds.sh b/scripts/feeds.sh index 351c87c43..d44242069 100755 --- a/scripts/feeds.sh +++ b/scripts/feeds.sh @@ -22,7 +22,7 @@ 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() { @@ -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"