From 36b404f3304eab2436b6c4d1f424c8af5d938cf2 Mon Sep 17 00:00:00 2001 From: Justin Hynes Date: Thu, 13 Mar 2025 13:29:16 -0400 Subject: [PATCH 1/2] fix: fixup theming setup during devstack provisioning Two changes: 1. By default, we clone repos with SSH now. Update the REPO_URL accordingly. 2. Updates the relevant lines to setup to setup comprehensive theming correctly. --- provision-set-edx-theme.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provision-set-edx-theme.sh b/provision-set-edx-theme.sh index 44b22f39..68d18cf4 100755 --- a/provision-set-edx-theme.sh +++ b/provision-set-edx-theme.sh @@ -2,7 +2,7 @@ # This script sets up the edX theme in LMS and CMS. -REPO_URL="https://github.com/edx/edx-themes" +REPO_URL="git@github.com:edx/edx-themes.git" THEME_DIR="/edx/src/edx-themes/edx-platform" DEVSTACK_FILE="../edx-platform/lms/envs/devstack.py" @@ -24,7 +24,7 @@ sed -i '' "/COMPREHENSIVE_THEME_DIRS = \[/a\\ \"$THEME_DIR\", " "$DEVSTACK_FILE" sed -i '' "s|^# \]|]|" "$DEVSTACK_FILE" -sed -i '' "s|^# TEMPLATES\[1\]\[\"DIRS\"\] = _make_mako_template_dirs|TEMPLATES[1][\"DIRS\"] = _make_mako_template_dirs|" "$DEVSTACK_FILE" +sed -i '' "s|^# TEMPLATES\[1\]\[\"DIRS\"\] = Derived(_make_mako_template_dirs)|TEMPLATES[1][\"DIRS\"] = Derived(_make_mako_template_dirs)|" "$DEVSTACK_FILE" sed -i '' "s|^# derive_settings(__name__)|derive_settings(__name__)|" "$DEVSTACK_FILE" From 7cfe870e69d82f100071283d12f0669bd5013b36 Mon Sep 17 00:00:00 2001 From: Justin Hynes Date: Fri, 14 Mar 2025 11:48:32 -0400 Subject: [PATCH 2/2] fix: update location of DEVSTACK_FILE --- provision-set-edx-theme.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision-set-edx-theme.sh b/provision-set-edx-theme.sh index 68d18cf4..bc7c5b2c 100755 --- a/provision-set-edx-theme.sh +++ b/provision-set-edx-theme.sh @@ -4,7 +4,7 @@ REPO_URL="git@github.com:edx/edx-themes.git" THEME_DIR="/edx/src/edx-themes/edx-platform" -DEVSTACK_FILE="../edx-platform/lms/envs/devstack.py" +DEVSTACK_FILE="./py_configuration_files/lms.py" # Clone the edx-themes repository into the src directory cd ../src