From 4425b4d8a3b1225852fd6b2ba65f1c71d1e4ebe7 Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 23 Nov 2023 16:22:46 -0700 Subject: [PATCH] Adding wrolpi-help to git safe directory. Help install failure should not break upgrade. --- scripts/install_help_service.sh | 1 + scripts/upgrade.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install_help_service.sh b/scripts/install_help_service.sh index ad48a7d0..7287d08b 100755 --- a/scripts/install_help_service.sh +++ b/scripts/install_help_service.sh @@ -11,6 +11,7 @@ set -e # Install WROLPi Help repo. git clone https://github.com/wrolpi/wrolpi-help.git /opt/wrolpi-help || : +git config --global --add safe.directory /opt/wrolpi-help (cd /opt/wrolpi-help && git fetch && git checkout master && git reset --hard origin/master) python3 -m venv /opt/wrolpi-help/venv /opt/wrolpi-help/venv/bin/pip3 install -r /opt/wrolpi-help/requirements.txt diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index 4729cf0c..75633916 100755 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -14,7 +14,7 @@ npm install || npm install || npm install || npm install # try install multiple (cd /opt/wrolpi && /opt/wrolpi/venv/bin/python3 /opt/wrolpi/main.py db upgrade) # Upgrade WROLPi Help. -/opt/wrolpi/scripts/install_help_service.sh +/opt/wrolpi/scripts/install_help_service.sh || echo "Help install failed." # Install any configs, restart services. /opt/wrolpi/repair.sh