From 131e5369db6a4ab2719613451f2f5f74a2e9ab60 Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Mon, 24 Jun 2024 15:54:37 +0200 Subject: [PATCH] don't install foreman using bin/dev, as overmind is now available as gem too --- bin/dev | 15 ++++----------- .../development-environment-osx/README.md | 5 ++--- .../development-environment-ubuntu/README.md | 5 ++--- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/bin/dev b/bin/dev index 686781e2c899..3b0257b2678d 100755 --- a/bin/dev +++ b/bin/dev @@ -1,17 +1,10 @@ #!/usr/bin/env bash -function fallback_to_foreman() { - echo 'Overmind not installed. Falling back to foreman...' - if ! command -v foreman &> /dev/null; then - echo 'Installing foreman...' - gem install foreman - fi - - foreman start -f Procfile.dev -} - if command -v overmind &> /dev/null; then overmind start -f Procfile.dev +elif command -v foreman &> /dev/null; then + foreman start -f Procfile.dev else - fallback_to_foreman + echo 'Neither overmind, nor foreman is installed, either `gem install overmind` or `gem install foreman`.' + exit 1 fi diff --git a/docs/development/development-environment-osx/README.md b/docs/development/development-environment-osx/README.md index 9c4c3509d4dc..0ea85c511bd7 100644 --- a/docs/development/development-environment-osx/README.md +++ b/docs/development/development-environment-osx/README.md @@ -216,9 +216,8 @@ RAILS_ENV=development bin/rails db:seed You can run all required workers of OpenProject through `overmind`, which combines them in a single tab. Optionally, you may also run `overmind` as a daemon and connect to services individually. -The `bin/dev` command will first check if `overmind` is available and run the application if via `Procfile.dev` if -possible. If not, -it falls back to `foreman`, installing it if needed. +The `bin/dev` command will first check if `overmind` is available and run the application via `Procfile.dev`. Otherwise +it will use `foreman` if it is available. ```shell bin/dev diff --git a/docs/development/development-environment-ubuntu/README.md b/docs/development/development-environment-ubuntu/README.md index 7a3c860abe5d..bf0117a93551 100644 --- a/docs/development/development-environment-ubuntu/README.md +++ b/docs/development/development-environment-ubuntu/README.md @@ -270,9 +270,8 @@ RAILS_ENV=development bin/rails db:seed You can run all required workers of OpenProject through `overmind`, which combines them in a single tab. Optionally, you may also run `overmind` as a daemon and connect to services individually. -The `bin/dev` command will first check if `overmind` is available and run the application if via `Procfile.dev` if -possible. If not, -it falls back to `foreman`, installing it if needed. +The `bin/dev` command will first check if `overmind` is available and run the application via `Procfile.dev`. Otherwise +it will use `foreman` if it is available. ```shell bin/dev