summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2007-01-31 18:33:04 +0000
committerMike Baker <mbm@openwrt.org>2007-01-31 18:33:04 +0000
commit7656ad75e5320ce90c09193942447e38d317367f (patch)
tree9b6517e7fe8b96f587ed81f7b07a9926ed2174cd /scripts
parentf206cee9db276978f3f240ef8db085b1409eba78 (diff)
downloadmaster-31e0f0ae-7656ad75e5320ce90c09193942447e38d317367f.tar.gz
master-31e0f0ae-7656ad75e5320ce90c09193942447e38d317367f.tar.bz2
master-31e0f0ae-7656ad75e5320ce90c09193942447e38d317367f.zip
move "make symlinks" to "make package/symlinks"
SVN-Revision: 6234
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/feeds.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/feeds.sh b/scripts/feeds.sh
index a16b212c80..351c87c43d 100755
--- a/scripts/feeds.sh
+++ b/scripts/feeds.sh
@@ -28,16 +28,16 @@ delete_symlinks() {
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 $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
@@ -48,7 +48,7 @@ checkout_feed() {
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