From e7570f7902376bf869bebb745d6c2eb5524dc4d5 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Fri, 20 Nov 2020 21:50:43 +0000 Subject: [PATCH] sde-update-tree: remove hardcoded package's url from the checkout loop Signed-off-by: Alejandro Mery --- bin/sde-update-tree | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/bin/sde-update-tree b/bin/sde-update-tree index f83a70a..b69c46c 100755 --- a/bin/sde-update-tree +++ b/bin/sde-update-tree @@ -150,7 +150,19 @@ update_svn() baseurl="$( git config remote.origin.url | sed -e 's|/[^/]*$||' )" [ -n "$baseurl" ] || baseurl="https://git.opensde.net/opensde" -for x in . package $( ls -1d package/* target/* 2> /dev/null ); do +set -- . \ + package:git+$baseurl/package-nopast.git \ + $( ls -1d package/* target/* 2> /dev/null ) + +for x; do + + if [ "$x" != "${x%%:*}" ]; then + url="${x#*:}" + x="${x%%:*}" + else + url= + fi + if [ -e "$x" -a ! -d "$x/" ]; then continue elif [ "$x" = "." ]; then @@ -160,14 +172,17 @@ for x in . package $( ls -1d package/* target/* 2> /dev/null ); do fi if [ ! -d "$x" ]; then - case "$x" in - package) - echo_info "$prefix:" - git clone "$baseurl/$x-nopast.git" "$x" - ;; - *) - echo_warning "$prefix: missing" - ;; + case "$url" in + "") + echo_warning "$prefix: missing" + ;; + git+*) + echo_info "$prefix" + git clone "${url#git+}" "$x" + ;; + *) + echo_warning "$prefix: invalid url ($url)" + ;; esac elif [ -d "$x/.git" ]; then ( cd "$x" && update_git "$prefix" )