From 513f1f065a085029379835e6e1f4c4d521f63329 Mon Sep 17 00:00:00 2001
From: ckeboss <mosesdog2@gmail.com>
Date: Wed, 12 Apr 2017 09:41:23 -0700
Subject: [PATCH 1/2] Wrap directory names in quotes

When there are spaces in any of the directories referenced, bash will error out. This wraps those items in quotes to allow bash to parse the path names properly.
---
 bin/docker/boot_dev | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/docker/boot_dev b/bin/docker/boot_dev
index be31b320fd6..93d1fbc4151 100755
--- a/bin/docker/boot_dev
+++ b/bin/docker/boot_dev
@@ -1,7 +1,7 @@
 #!/bin/bash
 SCRIPTPATH=$(cd "$(dirname "$0")"; pwd -P)
 SOURCE_DIR=$(cd "$SCRIPTPATH" && cd ../.. && pwd -P)
-DATA_DIR=$SOURCE_DIR/tmp/postgres
+DATA_DIR="$SOURCE_DIR/tmp/postgres"
 
 show_help() {
 cat <<EOF
@@ -36,16 +36,16 @@ echo "Using data in:   ${DATA_DIR}"
 
 mkdir -p "${DATA_DIR}"
 
-docker run -d -p 1080:1080 -p 3000:3000 -v $DATA_DIR:/shared/postgres_data -v $SOURCE_DIR:/src --hostname=discourse --name=discourse_dev --restart=always discourse/discourse_dev:latest /sbin/boot
+docker run -d -p 1080:1080 -p 3000:3000 -v "$DATA_DIR:/shared/postgres_data" -v "$SOURCE_DIR:/src" --hostname=discourse --name=discourse_dev --restart=always discourse/discourse_dev:latest /sbin/boot
 
 if [ "${initialize}" = "initialize" ]; then
     echo "Installing gems..."
-    ${SCRIPTPATH}/bundle install
+    "${SCRIPTPATH}/bundle" install
 
     echo "Migrating database..."
-    ${SCRIPTPATH}/rake db:migrate
-    RAILS_ENV=test ${SCRIPTPATH}/rake db:migrate
+    "${SCRIPTPATH}/rake" db:migrate
+    "RAILS_ENV=test ${SCRIPTPATH}/rake" db:migrate
 
     echo "Creating admin user..."
-    ${SCRIPTPATH}/rake admin:create
+    "${SCRIPTPATH}/rake" admin:create
 fi

From 6bfe92e19e827686f292a679fd8dcd2e0d90f9c7 Mon Sep 17 00:00:00 2001
From: ckeboss <mosesdog2@gmail.com>
Date: Wed, 12 Apr 2017 10:33:56 -0700
Subject: [PATCH 2/2] Update boot_dev

---
 bin/docker/boot_dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/docker/boot_dev b/bin/docker/boot_dev
index 93d1fbc4151..66a038a5e7a 100755
--- a/bin/docker/boot_dev
+++ b/bin/docker/boot_dev
@@ -44,7 +44,7 @@ if [ "${initialize}" = "initialize" ]; then
 
     echo "Migrating database..."
     "${SCRIPTPATH}/rake" db:migrate
-    "RAILS_ENV=test ${SCRIPTPATH}/rake" db:migrate
+    RAILS_ENV=test "${SCRIPTPATH}/rake" db:migrate
 
     echo "Creating admin user..."
     "${SCRIPTPATH}/rake" admin:create