Merge pull request #5618 from nebulab/spaghetticode/fix-sandbox-issues

Fix minor sandbox generation issues
solidusio · Jan 24, 2024 · 4b46992 · 4b46992
2 parents 8b5f57c + 17647e5
commit 4b46992
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/admin/lib/solidus_admin/install_tailwindcss.rb b/admin/lib/solidus_admin/install_tailwindcss.rb
@@ -73,7 +73,9 @@
   end
 RUBY
 
-append_file ".gitignore", "app/assets/builds/solidus_admin/"
+if Rails.root.join(".gitignore").exist?
+  append_file ".gitignore", "app/assets/builds/solidus_admin/"
+end
 
 unless Rails.root.join("Procfile.dev").exist?
   create_file "Procfile.dev", <<~YAML

diff --git a/core/lib/generators/solidus/install/install_generator.rb b/core/lib/generators/solidus/install/install_generator.rb
@@ -179,7 +179,9 @@ def install_solidus_admin
       return unless options[:admin_preview]
 
       say_status :installing, "SolidusAdmin", :blue
-      bundle_command 'add solidus_admin -v ">= 0.2"'
+      unless File.read(app_path.join('Gemfile')).include?('solidus_admin')
+        bundle_command 'add solidus_admin -v ">= 0.2"'
+      end
       generate 'solidus_admin:install'
     end