Skip to content

Commit

Permalink
Merge pull request #57 from yvoronoy/rc-3.0.2
Browse files Browse the repository at this point in the history
- Fixed issue when multiple instances are deployed in folders with the same names, e.g., ~/project1/m2d and ~/project2/m2d
- Fixed issue with mutagen session selection when session names are like m2d and m2d-project1
  • Loading branch information
glo47154 authored Jun 16, 2023
2 parents fb6a98b + d5800f3 commit e8236ea
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion bin/m2d
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ function _m2d_sync ()
local sync_web="m2d-web$(_m2d_env_get_parameter $env_file M2D_PROJECT_SUFFIX)"
case $action in
'start')
if [[ -n $(mutagen sync list | grep $sync_name) ]]; then
if [[ -n $(mutagen sync list | grep "^Name: $sync_name$") ]]; then
mutagen sync resume $sync_name
else
mutagen sync create --name=$sync_name \
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
version: '3'

name: "m2d${M2D_PROJECT_SUFFIX:-}"
services:
web:
container_name: "m2d-web${M2D_PROJECT_SUFFIX:-}"
Expand Down

0 comments on commit e8236ea

Please sign in to comment.