From 2b39df75a79ce9f1a422f565e8a9c5ce6c841aa9 Mon Sep 17 00:00:00 2001 From: robjmcgibbon <robjmcgibbon@gmail.com> Date: Wed, 28 May 2025 10:41:02 +0200 Subject: [PATCH] Bugfix in make_page.sh --- make_page.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make_page.sh b/make_page.sh index 7e10355..59bf4d3 100755 --- a/make_page.sh +++ b/make_page.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l set -e @@ -23,7 +23,7 @@ rsync -auv compiled/* ../ [ ! -d "swift" ] && git clone "git@gitlab.cosma.dur.ac.uk:swift/swiftsim.git" "swift" cd swift -git checkout master +[ "$(git rev-parse --abbrev-ref HEAD)" != "master" ] && git checkout master git pull # Generate read the docs cd doc/RTD @@ -42,7 +42,7 @@ cp swift/doc/onboardingGuide/build/latex/onboarding.pdf ../onboarding.pdf # Generate read the docs for the zoom branch [ ! -d "swift_will" ] && git clone "git@gitlab.cosma.dur.ac.uk:swift/swiftsim.git" "swift_will" cd swift_will -git checkout zoom_docs +[ "$(git rev-parse --abbrev-ref HEAD)" != "zoom_docs" ] && git checkout zoom_docs git pull cd doc/RTD [ -d "build" ] && rm -rf build -- GitLab