From 8b7e334288b65ee4a8c5835f65f6881ca9870524 Mon Sep 17 00:00:00 2001 From: zino Date: Thu, 23 Nov 2023 11:35:53 +0100 Subject: [PATCH] changed to branch --- deploy_funmaps.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/deploy_funmaps.sh b/deploy_funmaps.sh index 712729a..8c3fb4a 100644 --- a/deploy_funmaps.sh +++ b/deploy_funmaps.sh @@ -5,15 +5,14 @@ # Exit immediately if a command exits with a non-zero status set -e -# Git variables -GIT_ADDRESS="ssh://git@git.zinomedia.de:222" -REPO_NAME="zino/lgsm-cs-funmaps-addon.git" - # Directory variables -VOLUMES_DIR="${CURRENT_DIR}/volumes" CURRENT_DIR="${PWD}" +VOLUMES_DIR="${CURRENT_DIR}/volumes" CONFIG_REPO_DIR="$(mktemp -d)" +# Combined Git clone command +GIT_COMMAND="sudo git clone -b funmaps ssh://git@git.zinomedia.de:222/zino/lgsm-cs.git ${CONFIG_REPO_DIR}" + # Function to display [INFO] in blue and the message in default color info() { printf "\033[0;34m[INFO]\033[0m %s\n" "$1" @@ -22,7 +21,7 @@ info() { # Function to clone and merge configuration repository clone_and_merge_config() { info "Cloning configuration repository to ${CONFIG_REPO_DIR}..." - sudo git clone ${GIT_ADDRESS}/${REPO_NAME} "${CONFIG_REPO_DIR}" + ${GIT_COMMAND} info "Merging configuration from ${CONFIG_REPO_DIR} to ${VOLUMES_DIR}..." sudo rsync -a "${CONFIG_REPO_DIR}/" "${VOLUMES_DIR}/"