new version upgrade for composer - close #133

maglub · Oct 14, 2015 · c801cd6 · c801cd6
1 parent 08da70e
commit c801cd6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/bin/functions-upgrade b/bin/functions-upgrade
@@ -375,3 +375,21 @@ function piLogger_doUpgrade_20150920-002_to_20151020-001(){
       return $?;
    fi 
 }
+
+#========================================
+# from 20151020-001 to 20151014-001
+#========================================
+function piLogger_doUpgrade_20151020-001_to_20151014-001(){
+
+  echo "    - moving composer files from previous installations if necessary"
+  [ -d $baseDir/include/vendor ] && mv $baseDir/include/vendor $baseDir/vendor
+  [ -f $baseDir/include/composer.lock ] && mv $baseDir/include/composer.lock $baseDir/composer.lock
+
+  echo "    - check if composer files are at the correct place now"
+  if [ -d $baseDir/vendor ] && [ -f $baseDir/composer.lock ]; then
+     return 0;
+  else
+     return -1;
+  fi
+
+}
diff --git a/bin/upgrade.sh b/bin/upgrade.sh
@@ -103,7 +103,8 @@ versions="20150422-001
 20150918-001
 20150920-001
 20150920-002
-20151020-001"
+20151020-001
+20151014-001"
 
 fromVersion=""
 for toVersion in $versions

diff --git a/currentVersion b/currentVersion
@@ -1 +1 @@
-20151002-001
+20151014-001