Skip to content

Commit

Permalink
Merge pull request #192 from RyanofWoods/ryanofwoods/fix-sandbox-defa…
Browse files Browse the repository at this point in the history
…ult-solidus-branch

Fix sandbox default solidus branch
  • Loading branch information
mergify[bot] authored Nov 9, 2022
2 parents 6270b0b + 611a98f commit 787b596
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions lib/solidus_dev_support/templates/extension/bin/sandbox.tt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

set -e
if [ ! -z $DEBUG ]
if [ -n "$DEBUG" ]
then
set -x
fi
Expand All @@ -28,16 +28,14 @@ sqlite3|sqlite)
esac
echo "~~> Using $RAILSDB as the database engine"

if [ -n $SOLIDUS_BRANCH ]
if [ -z "$SOLIDUS_BRANCH" ]
then
BRANCH=$SOLIDUS_BRANCH
else
echo "~~> Use 'export SOLIDUS_BRANCH=[master|v3.2|...]' to control the Solidus branch"
BRANCH="master"
SOLIDUS_BRANCH="master"
fi
echo "~~> Using branch $BRANCH of solidus"
echo "~~> Using branch $SOLIDUS_BRANCH of solidus"

if [ -z $SOLIDUS_FRONTEND ]
if [ -z "$SOLIDUS_FRONTEND" ]
then
echo "~~> Use 'export SOLIDUS_FRONTEND=[solidus_frontend|solidus_starter_frontend]' to control the Solidus frontend"
SOLIDUS_FRONTEND="solidus_frontend"
Expand Down Expand Up @@ -68,7 +66,7 @@ fi

cd ./sandbox
cat <<RUBY >> Gemfile
gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
gem 'solidus', github: 'solidusio/solidus', branch: '$SOLIDUS_BRANCH'
gem 'rails-i18n'
gem 'solidus_i18n'
Expand Down

0 comments on commit 787b596

Please sign in to comment.