홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
84ca6e75 1 parent 3e7afd86

Fixed Apache Karaf fetch URL to use onosproject.org. 

Change-Id: I9ed7220df490c90619665e38cb9c4979250c54e5
Inline Side-by-side
Showing 1 changed file with 2 additions and 5 deletions
...@@ -22,10 +22,7 @@ cd $ONOS_STAGE ...@@ -22,10 +22,7 @@ cd $ONOS_STAGE
22 # Check if Apache Karaf bits are available and if not, fetch them. 22 # Check if Apache Karaf bits are available and if not, fetch them.
23 if [ ! -f $KARAF_ZIP -a ! -f $KARAF_TAR ]; then 23 if [ ! -f $KARAF_ZIP -a ! -f $KARAF_TAR ]; then
24 echo "Downloading $KARAF_TAR..." 24 echo "Downloading $KARAF_TAR..."
25 - karafURL=$(curl -s http://www.apache.org/dyn/closer.cgi/karaf/$KARAF_VERSION/apache-karaf-$KARAF_VERSION.tar.gz | 25 + curl -sL http://downloads.onosproject.org/third-party/apache-karaf-$KARAF_VERSION.tar.gz > $KARAF_TAR
26 - grep "<a href=\".*apache-karaf-$KARAF_VERSION.tar.gz\"" |
27 - head -n 1 | sed 's/.*<a href="//g;s/".*//g')
28 - curl -s $karafURL > $KARAF_TAR
29 fi 26 fi
30 [ ! -f $KARAF_ZIP -a ! -f $KARAF_TAR ] && \ 27 [ ! -f $KARAF_ZIP -a ! -f $KARAF_TAR ] && \
31 echo "Apache Karaf bits $KARAF_ZIP or $KARAF_TAR not found" && exit 1 28 echo "Apache Karaf bits $KARAF_ZIP or $KARAF_TAR not found" && exit 1
...@@ -79,5 +76,5 @@ echo $ONOS_VERSION > $ONOS_STAGE/VERSION ...@@ -79,5 +76,5 @@ echo $ONOS_VERSION > $ONOS_STAGE/VERSION
79 cd $ONOS_STAGE_ROOT 76 cd $ONOS_STAGE_ROOT
80 COPYFILE_DISABLE=1 tar zcf $ONOS_TAR $ONOS_BITS 77 COPYFILE_DISABLE=1 tar zcf $ONOS_TAR $ONOS_BITS
81 which zip >/dev/null && zip -rq $ONOS_ZIP $ONOS_BITS 78 which zip >/dev/null && zip -rq $ONOS_ZIP $ONOS_BITS
82 -ls -l $ONOS_TAR $ONOS_ZIP >&2 79 +ls -l $ONOS_TAR $ONOS_ZIP 2>/dev/null
83 rm -r $ONOS_STAGE 80 rm -r $ONOS_STAGE
......