rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-03-01 23:29:23 +01:00
Code Issues Releases Activity

Merge branch 'dev' for release 4.6.5

Browse Source
This commit is contained in:
Sylvain 2020-12-07 10:20:50 +01:00
commit 2621451062
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -2,6 +2,9 @@
## Next release ## 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 ## v4.6.4 2020 December 1st
- Full Portuguese translation (thanks to [@gusabr](https://crowdin.com/profile/gusabr)) - Full Portuguese translation (thanks to [@gusabr](https://crowdin.com/profile/gusabr))

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fab-manager", "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.", "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": [ "keywords": [
"fablab", "fablab",

4
setup/upgrade.sh
View File

@ -75,9 +75,9 @@ version_error()
version_check() version_check()
{ {
VERSION=$(docker-compose exec "$SERVICE" cat .fabmanager-version) VERSION=$(docker-compose exec -T "$SERVICE" cat .fabmanager-version)
if [[ $? = 1 ]]; then 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 fi
if verlt "$VERSION" 2.8.3; then if verlt "$VERSION" 2.8.3; then