Merge branch 'dev' for release 4.6.5

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Next release
 
+## v4.6.5 2020 December 07
+- Fix a bug: unable to run the upgrade script with docker-compose >= v1.19
+
 ## v4.6.4 2020 December 1st
 
 - Full Portuguese translation (thanks to [@gusabr](https://crowdin.com/profile/gusabr))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "4.6.4",
+  "version": "4.6.5",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",

setup/upgrade.sh

@@ -75,9 +75,9 @@ version_error()
 
 version_check()
 {
-  VERSION=$(docker-compose exec "$SERVICE" cat .fabmanager-version)
+  VERSION=$(docker-compose exec -T "$SERVICE" cat .fabmanager-version)
   if [[ $? = 1 ]]; then
-    VERSION=$(docker-compose exec "$SERVICE" cat package.json | grep version | awk 'BEGIN { FS = "\"" } ; {print $4}')
+    VERSION=$(docker-compose exec -T "$SERVICE" cat package.json | grep version | awk 'BEGIN { FS = "\"" } ; {print $4}')
   fi
 
   if verlt "$VERSION" 2.8.3; then