From 6cca9dca31681f8e2e681ba5d75e7cc4587c3970 Mon Sep 17 00:00:00 2001
From: Eric Bremner <ebremner@uwaterloo.ca>
Date: Tue, 17 May 2022 17:46:57 -0400
Subject: [PATCH] ISTWCMS-5509: updating settings for drupal theming

---
 build_ohana.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/build_ohana.sh b/build_ohana.sh
index c6b6847c..bdfbbe75 100755
--- a/build_ohana.sh
+++ b/build_ohana.sh
@@ -44,6 +44,18 @@ nvm install $version
 echo "**************************************************************************************"
 echo "Done installing correct npm version."
 
+echo "**************************************************************************************"
+echo "Setting up theming ..."
+if [[ $build_option == 1 ]]; then
+  ln -s "$DRUPAL_PATH"/web/profiles/uw_base_profile/modules/custom/uw_wcms_ohana/ohana/dist "$DRUPAL_PATH"/web/profiles/uw_base_profile/modules/custom/uw_wcms_ohana/dist
+  rm -rf src/patterns
+  ln -s ../../src/patterns src/patterns
+else
+  mv "$DRUPAL_PATH"/web/profiles/uw_base_profile/modules/custom/uw_wcms_ohana/ohana/dist "$DRUPAL_PATH"/web/profiles/uw_base_profile/modules/custom/uw_wcms_ohana/
+fi
+echo "**************************************************************************************"
+echo "Done setting up theming."
+
 echo "**************************************************************************************"
 echo "Running npm install ..."
 if [[ $os_option == 1 ]]; then
@@ -53,13 +65,6 @@ npm install
 echo "**************************************************************************************"
 echo "Done running npm install."
 
-echo "**************************************************************************************"
-echo "Setting up src sym link ..."
-rm -rf src/patterns
-ln -s ../../src/patterns src/patterns
-echo "**************************************************************************************"
-echo "Done setting up src sym link."
-
 echo "**************************************************************************************"
 echo "Running npm run build ..."
 npm run build
-- 
GitLab