add rc to release.sh

diff --git a/publish.sh b/publish.sh
index ebb6900fd396939bf45b6fcc0a4facb7fb233945..fce438e1c151e759a702488a8ffee567e2029294 100755 (executable)
--- a/publish.sh
+++ b/publish.sh
@@ -16,7 +16,11 @@ else
     if echo $vers | grep -q unstable ; then
        component="ceph-unstable"
     else
-       component="ceph-stable"
+       if echo $vers | grep -q rc ; then
+           component="ceph-rc"
+       else
+           component="ceph-stable"
+       fi
     fi
 fi
 echo component $component

diff --git a/release.sh b/release.sh
index cbd6e1a894cd51c841af9a44e698b639f2d1860d..7b3edfb41a628b1bb5c74e02965594dde48dde18 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -8,7 +8,7 @@ echo vers $vers
 repo=$1
 force=$2
 
-[ -z "$repo" ] && echo stable or testing or unstable && exit 1
+[ -z "$repo" ] && echo stable or testing or unstable or rc && exit 1
 
 if git diff --quiet ; then
     echo repository is clean
@@ -26,16 +26,11 @@ fi
 gitver=`git rev-parse HEAD 2>/dev/null | cut -c 1-8`
 echo gitver $gitver
 
-if [ "$repo" = "testing" ]; then
-    versuffix=`date "+%Y%m%d%H%M"`
-    finalvers="${vers}-testing${versuffix}-$gitver"
+if [ "$repo" = "stable" ]; then
+    finalvers="$vers"
 else
-    if [ "$repo" = "unstable" ]; then
-       versuffix=`date "+%Y%m%d%H%M"`
-       finalvers="${vers}-unstable${versuffix}-$gitver"
-    else
-       finalvers="$vers"
-    fi
+    versuffix=`date "+%Y%m%d%H%M"`
+    finalvers="${vers}-$repo${versuffix}-$gitver"
 fi
 
 echo final vers $finalvers