홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
a317872d 1 parent 955c316b

Some improvements to release tools 

Change-Id: I651866d746a1e661fcefe0b28ef1e8e57cd502e9
Inline Side-by-side
Showing 3 changed files with 4 additions and 3 deletions
...@@ -26,7 +26,8 @@ git fetch origin ...@@ -26,7 +26,8 @@ git fetch origin
26 git checkout $BRANCH 26 git checkout $BRANCH
27 27
28 # Check existance of version 28 # Check existance of version
29 -git tag -l | grep -q $ONOS_VERSION && { echo "ERROR: Version already exists"; exit -1; } 29 +git tag -l | grep -q "$ONOS_VERSION\$" &&
30 + { echo "ERROR: Version already exists"; exit -1; }
30 31
31 export ONOS_ROOT=$DIR 32 export ONOS_ROOT=$DIR
32 . $ONOS_ROOT/tools/build/envDefaults 33 . $ONOS_ROOT/tools/build/envDefaults
......
...@@ -39,7 +39,7 @@ function testJavaVersion { ...@@ -39,7 +39,7 @@ function testJavaVersion {
39 trap "echo 'FAILED'" ERR 39 trap "echo 'FAILED'" ERR
40 printf "Checking Java version... " 40 printf "Checking Java version... "
41 v=$(javac -version 2>&1 | grep 1.8.0_ | sed -e 's/.*1.8.0_\([0-9]*\).*/\1/g') 41 v=$(javac -version 2>&1 | grep 1.8.0_ | sed -e 's/.*1.8.0_\([0-9]*\).*/\1/g')
42 - test "$v" -ge 74 42 + test "$v" -ge 73
43 echo "OK" 43 echo "OK"
44 } 44 }
45 45
......
...@@ -8,7 +8,7 @@ set -e ...@@ -8,7 +8,7 @@ set -e
8 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1 8 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
9 . $ONOS_ROOT/tools/build/envDefaults 9 . $ONOS_ROOT/tools/build/envDefaults
10 10
11 -user=${1:-$USER} 11 +user=${1:-${WIKI_USER:-$USER}}
12 remote=$user@wiki.onosproject.org 12 remote=$user@wiki.onosproject.org
13 13
14 scp $ONOS_ROOT/docs/target/onos-apidocs-$ONOS_VERSION.tar.gz $remote:/tmp 14 scp $ONOS_ROOT/docs/target/onos-apidocs-$ONOS_VERSION.tar.gz $remote:/tmp
......