Skip to content

Conversation

dorianmariecom
Copy link
Contributor

@dorianmariecom dorianmariecom commented Feb 25, 2022

    conflict  bin/dev
Overwrite /Users/dorianmariefr/src/pipelines/bin/dev? (enter "h" for help) [Ynaqdhm] d
--- /Users/dorianmariefr/src/pipelines/bin/dev	2022-02-25 19:25:58.000000000 +0100
+++ /Users/dorianmariefr/src/pipelines/bin/dev20220225-32075-ytg5lb	2022-02-25 19:42:59.000000000 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if ! gem list --silent --installed foreman
+if ! command -v foreman &> /dev/null
 then
   echo "Installing foreman..."
   gem install foreman
Retrying...
Overwrite /Users/dorianmariefr/src/pipelines/bin/dev? (enter "h" for help) [Ynaqdhm] 

@dorianmariecom
Copy link
Contributor Author

See rails/cssbundling-rails#80 for a similar one I made on cssbundling-rails

@rafaelfranca rafaelfranca merged commit 44b94c6 into rails:main Feb 25, 2022
@dorianmariecom dorianmariecom deleted the patch-1 branch February 25, 2022 19:13
yahonda added a commit to yahonda/rails that referenced this pull request Mar 1, 2022
When both jsbundling-rails v1.0.1 and cssbundling-rails v1.1.0
are used at the same time, thor shows the prompt to replace `bin/dev` or
not.

jsbundling-rails v1.0.2 addresses this issue.
https://github.com/rails/jsbundling-rails/releases/tag/v1.0.2
rails/jsbundling-rails#95
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants