diff --git a/.sandstorm/build.sh b/.sandstorm/build.sh index 93daf1ba86..4ad0a75865 100755 --- a/.sandstorm/build.sh +++ b/.sandstorm/build.sh @@ -3,11 +3,17 @@ # This script only runs once, when the app connects to sandstorm. set -euo pipefail - +echo "In build.sh" cd /opt/app -cp .env.sandstorm .env +if [ -f /opt/app/.env.sandstorm ] ; then + echo "No sandstorm env file, copy." + cp .env.sandstorm .env +else + echo "Sandstorm env file exists already." +fi + if [ -f /opt/app/composer.json ] ; then if [ ! -f composer.phar ] ; then diff --git a/.sandstorm/launcher.sh b/.sandstorm/launcher.sh index d540f123aa..cb7281917a 100755 --- a/.sandstorm/launcher.sh +++ b/.sandstorm/launcher.sh @@ -1,6 +1,7 @@ #!/bin/bash # Runs every time we create a new grain! +echo "Now in launcher.sh" # Create a bunch of folders under the clean /var that php, nginx, and mysql expect to exist mkdir -p /var/lib/mysql @@ -30,7 +31,6 @@ mkdir -p /var/storage/framework/views mkdir -p /var/storage/logs mkdir -p /var/storage/upload - # Ensure mysql tables created HOME=/etc/mysql /usr/bin/mysql_install_db --force diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh index 8c794e9588..35aca44868 100755 --- a/.sandstorm/setup.sh +++ b/.sandstorm/setup.sh @@ -2,6 +2,7 @@ # When you change this file, you must take manual action. Read this doc: # - https://docs.sandstorm.io/en/latest/vagrant-spk/customizing/#setupsh +echo "Now in setup.sh" set -euo pipefail