From 5824f0797acb2b10f4583fb39fb214836e2b6e03 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 23 Jul 2022 12:18:50 +0200 Subject: [PATCH] Update web-ui bundled script to use master-3.0 --- scripts/update-bundled-web-ui.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/update-bundled-web-ui.sh b/scripts/update-bundled-web-ui.sh index 5b295e91..bc942f2e 100755 --- a/scripts/update-bundled-web-ui.sh +++ b/scripts/update-bundled-web-ui.sh @@ -67,23 +67,23 @@ echo "Re-create: $GNS3SERVER_DIR/gns3server/static/web-ui" mkdir -p "$GNS3SERVER_DIR/gns3server/static/web-ui/" if [ "$CUSTOM_REPO" = false ] ; then - if [ ! -d /tmp/gns3-web-ui ]; then + if [ ! -d "$REPO_DIR" ]; then git clone https://github.com/GNS3/gns3-web-ui.git "$REPO_DIR" - else - cd "$REPO_DIR" + fi - git checkout master - git fetch --tags - git pull + cd "$REPO_DIR" - if [[ -n "$TAG" ]] - then - echo "Switching to tag: ${TAG}" - git checkout "tags/${TAG}" - fi + git checkout master-3.0 + git fetch --tags + git pull - cd "$CURRENT_DIR" + if [[ -n "$TAG" ]] + then + echo "Switching to tag: ${TAG}" + git checkout "tags/${TAG}" fi + + cd "$CURRENT_DIR" fi echo "Current working dir $REPO_DIR"