From be43693ef05dfae85872412f198d87a31424f486 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 29 Nov 2018 11:11:11 -0500
Subject: [PATCH 1/4] Avoid using make for autobuild; reducing necessary
 dependencies out of the box.

---
 scripts/common_startup.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index 522a522603e..63951929efe 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -241,10 +241,16 @@ if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
     fi
 
     # Build client
-    if ! make client-production-maps; then
-        echo "ERROR: Galaxy client build failed. See ./client/README.md for more information, including how to get help."
-        exit 1
+    pushd client
+    if yarn install --network-timeout 120000 --check-files; then
+        if ! yarn run build-production-maps; then
+            echo "ERROR: Galaxy client build failed. See ./client/README.md for more information, including how to get help."
+            exit 1
+        fi
+    else
+        echo "ERROR: Galaxy client dependency installation failed. See ./client/README.md for more information, including how to get help."
     fi
+    popd
 else
     echo "Regenerating static plugin directories."
     python ./scripts/plugin_staging.py

From 77aec5a79dc18e224ca6246659f68a49864a46cf Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 29 Nov 2018 11:11:37 -0500
Subject: [PATCH 2/4] Standardize on spaces in common_startup.sh (tabs were
 mixed in here)

---
 scripts/common_startup.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index 63951929efe..b7f053515cb 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -69,14 +69,14 @@ in_conda_env() {
 }
 
 if [ $COPY_SAMPLE_FILES -eq 1 ]; then
-	# Create any missing config/location files
-	for sample in $SAMPLES; do
-		file=${sample%.sample}
-	    if [ ! -f "$file" -a -f "$sample" ]; then
-	        echo "Initializing $file from $(basename "$sample")"
-	        cp "$sample" "$file"
-	    fi
-	done
+    # Create any missing config/location files
+    for sample in $SAMPLES; do
+        file=${sample%.sample}
+        if [ ! -f "$file" -a -f "$sample" ]; then
+            echo "Initializing $file from $(basename "$sample")"
+            cp "$sample" "$file"
+        fi
+    done
 fi
 
 # remove problematic cached files

From fa408f485048ee8c7afeb96ac6c9da8dea4661f3 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 29 Nov 2018 11:19:45 -0500
Subject: [PATCH 3/4] exit with error code (and appropriate message) on either
 build failure

---
 scripts/common_startup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index b7f053515cb..a3dfde519fe 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -249,6 +249,7 @@ if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
         fi
     else
         echo "ERROR: Galaxy client dependency installation failed. See ./client/README.md for more information, including how to get help."
+        exit 1
     fi
     popd
 else

From 66fae561b29507a69f5c32690be4791f86f5cdd7 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Sun, 2 Dec 2018 22:04:45 -0500
Subject: [PATCH 4/4] Don't use pushd/popd

---
 scripts/common_startup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index a3dfde519fe..ff9f853bdbf 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -241,7 +241,7 @@ if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
     fi
 
     # Build client
-    pushd client
+    cd client
     if yarn install --network-timeout 120000 --check-files; then
         if ! yarn run build-production-maps; then
             echo "ERROR: Galaxy client build failed. See ./client/README.md for more information, including how to get help."
@@ -251,7 +251,7 @@ if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
         echo "ERROR: Galaxy client dependency installation failed. See ./client/README.md for more information, including how to get help."
         exit 1
     fi
-    popd
+    cd -
 else
     echo "Regenerating static plugin directories."
     python ./scripts/plugin_staging.py