zimbra-builder.sh: Support for beta builds.

And also a minimal change in version format.

zimbra-builder.sh

@@ -25,10 +25,31 @@ if [ "x" == "x${ZM_BUILDER_ID}" ] ; then
   ZM_BUILDER_ID="manual"
 fi
 
-ZM_BUILD_RELEASE_SANITIZED="${ZM_BUILD_RELEASE_NO_WITH_PATCH//./}"
-BUILD_RELEASE_CANDIDATE="GAZ${ZM_BUILD_RELEASE_SANITIZED}Z${ZM_BUILDER_ID}"
+function get_build_release_candidate() {
 
-ZM_BUILD_RELEASE_NO="${ZM_BUILD_RELEASE_NO_WITH_PATCH%.[pP]*}"
+  _ZM_BUILD_RELEASE_NO_WITH_PATCH="$1"
+  _ZM_BUILDER_ID="$2"
+
+  _ZM_BUILD_RELEASE_CANDIDATE_SEPARATOR1="z"
+  _ZM_BUILD_RELEASE_CANDIDATE_SEPARATOR2="Z"
+  _ZM_BUILD_RELEASE_CANDIDATE_SEPARATOR3="x"
+  _ZM_BUILD_RELEASE_CANDIDATE_PREFIX="GA"
+  if echo ${_ZM_BUILD_RELEASE_NO_WITH_PATCH} | grep -i 'beta' > /dev/null 2>&1 ; then
+    _ZM_BUILD_RELEASE_CANDIDATE_PREFIX="BETA"
+  fi
+
+  _ZM_BUILD_RELEASE_SANITIZED="${_ZM_BUILD_RELEASE_NO_WITH_PATCH//./${_ZM_BUILD_RELEASE_CANDIDATE_SEPARATOR3}}"
+
+  _BUILD_RELEASE_CANDIDATE="${_ZM_BUILD_RELEASE_CANDIDATE_PREFIX}${_ZM_BUILD_RELEASE_CANDIDATE_SEPARATOR1}${_ZM_BUILD_RELEASE_SANITIZED}${_ZM_BUILD_RELEASE_CANDIDATE_SEPARATOR2}${_ZM_BUILDER_ID}"
+
+  echo ${_BUILD_RELEASE_CANDIDATE}
+
+}
+
+BUILD_RELEASE_CANDIDATE="$(get_build_release_candidate ${ZM_BUILD_RELEASE_NO_WITH_PATCH} ${ZM_BUILDER_ID})"
+
+ZM_BUILD_RELEASE_NO_TMP1="${ZM_BUILD_RELEASE_NO_WITH_PATCH%.[pP]*}"
+ZM_BUILD_RELEASE_NO="${ZM_BUILD_RELEASE_NO_TMP1%.[bB][eE][tT][aA]}"
 
 cd installer-build