Update version number

README.md

@@ -115,12 +115,12 @@ You have two choices:
 
 We recommend to install with the default configurations, but in case you want to modify the configurations you can create a file in /etc/kave/CustomInstall.py,For an example and more information run the installer with --help
 
-* 1: Installing the released version, for example, 2.1-Beta-Pre
+* 1: Installing the released version, for example, 2.1-Beta
 
 ```
 yum -y install wget curl tar zip unzip gzip
-wget http://repos:kaverepos@repos.kave.io/noarch/KaveToolbox/2.1-Beta-Pre/kavetoolbox-installer-2.1-Beta-Pre.sh
-sudo bash kavetoolbox-installer-2.1-Beta-Pre.sh [--quiet]
+wget http://repos:kaverepos@repos.kave.io/noarch/KaveToolbox/2.1-Beta/kavetoolbox-installer-2.1-Beta.sh
+sudo bash kavetoolbox-installer-2.1-Beta.sh [--quiet]
 ```
 (--quiet is for a quieter install, remove the brackets!)
 Remember the help at this stage  [--help]

ReleaseNotes.md

@@ -39,15 +39,15 @@ Major changes:
   Each directory also has a pro softlink, which is created during install. Advanced users may wish to modify this softlink
   This versioning scheme has several benefits:
   a) Ability to have multiple KTB versions operating side-by-side
-     (to start a different KTB run the KaveEnv script with the version as a parameter, i.e. KaveEnv.sh 2.1-Beta-Pre)
+     (to start a different KTB run the KaveEnv script with the version as a parameter, i.e. KaveEnv.sh 2.1-Beta)
   b) Simpler upgrading
      (no need to delete /opt content yourself before the upgrade, if needed the script can do that for you
      with --clean-after, or --clean-if-disk-full, see the installation help for more new flags)
 * Affect of version numbering on script locations: the KaveToolbox distribution used to be placed under
   /topdir/KaveToolbox directly (e.g. /opt/KaveToolbox/scripts/KaveEnv.sh). Now it is moved to a versioned directory
-  (e.g. /opt/KaveToolbox/2.1-Beta-Pre/scripts/KaveEnv.sh). Scripts which explicitly source the env file or bind against
+  (e.g. /opt/KaveToolbox/2.1-Beta/scripts/KaveEnv.sh). Scripts which explicitly source the env file or bind against
   explicit directories will need to be updated accordingly, either to point to the new static location, or to point
-  to the new dynamic location (e.g.: /opt/KaveToolbox/2.1-Beta-Pre/pro/KaveEnv.sh)
+  to the new dynamic location (e.g.: /opt/KaveToolbox/2.1-Beta/pro/KaveEnv.sh)
 * We have created an update script can poll for latest versions from the repository.
   The new KaveUpdate script will poll the repo server for latest versions and install what you request
 * KaveEnv script will now take a version arguement to enable a specific version (pro by default)

config/kaveinstall.py

@@ -42,7 +42,7 @@ class Component(object), instantiated as Component(name), wrapper for generic in
 #  this password is intended to be widely known and is used here as an extension of the URL
 #
 __repo_url__ = "http://repos:kaverepos@repos.kave.io"
-__version__ = "2.1-Beta-Pre"
+__version__ = "2.1-Beta"
 __main_dir__ = "KaveToolbox"
 __arch__ = "Centos6"
 __mirror_list_file__ = "/etc/kave/mirror"

scripts/KaveUpdate

@@ -23,7 +23,7 @@ This python script downloads a new install script from the repository, and execu
 This should make it easier to perform updates of KAVE software into the future.
 
 There are installation scripts looking like:
-http://repos:kaverepos@repos.kave.io/noarch/KaveToolbox/2.1-Beta-Pre/kavetoolbox-installer-2.1-Beta-Pre.sh
+http://repos:kaverepos@repos.kave.io/noarch/KaveToolbox/2.1-Beta/kavetoolbox-installer-2.1-Beta.sh
 for each installation.
 
 usage:

tests/unit/testversion.py

@@ -29,7 +29,7 @@ class TestVersions(unittest.TestCase):
     """
     re = re.compile("([0-9]\.[0-9]-Beta(-Pre)?)")
     ignore = ["ReleaseNotes.md"]
-    checkAgainst = "2.1-Beta-Pre"
+    checkAgainst = "2.1-Beta"
 
     def findversion(self, fullpath):
         found = []