Merge pull request #1820 from camptocamp/revert-1818-fix-upgrade

Revert "Fix upgrade script"

Author: sbrunner

scripts/upgrade

@@ -11,13 +11,14 @@ function printdiff {
 git config user.email "<ci@camptocamp.com>"
 git config user.name "Continuous integration"
 VERSION=$1
-if [[ "${VERSION}" == "master" ]]; then
+VERSION_UPGRADE=$1
+if [[ "${VERSION_UPGRADE}" == "master" || "${VERSION_UPGRADE}" == "latest" ]]; then
     VERSION=2.10
 fi
-if [[ "${VERSION}" == "latest" ]]; then
-    VERSION=2.9
+if [[ "${VERSION_UPGRADE}" == "latest" ]]; then
+    VERSION_UPGRADE=master
 fi
-./build --upgrade "$VERSION"
+./build --upgrade "$VERSION_UPGRADE"
 
 if [ -e .UPGRADE6 ]; then
     ./upgrade "${VERSION}" 7