7167976: Fix broken get_source.sh script
authorohair
Fri, 11 May 2012 17:52:57 -0700
changeset 12583 78cadbe9f385
parent 12582 46d24df71c5d
child 12584 8c8235b1fcb6
7167976: Fix broken get_source.sh script Reviewed-by: tbell
make/scripts/hgforest.sh
--- a/make/scripts/hgforest.sh	Thu May 10 08:26:26 2012 -0700
+++ b/make/scripts/hgforest.sh	Fri May 11 17:52:57 2012 -0700
@@ -59,8 +59,8 @@
   done
   if [ "${pull_extra_base}" != "" ] ; then
     subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs"
-    pull_default_base=`echo ${pull_default} | sed -e 's@\(^.*://[^/]*\)/.*@\1@'`
-    pull_extra=`echo ${pull_default} | sed -e "s@${pull_default_base}@${pull_extra_base}@"`
+    pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'`
+    pull_extra="${pull_extra_base}/${pull_default_tail}"
     for i in ${subrepos_extra} ; do
       if [ ! -f ${i}/.hg/hgrc ] ; then
         repos_extra="${repos_extra} ${i}"