From 8c59fc544512458650462781892764e61ecc2786 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 29 Sep 2025 07:35:58 +0000 Subject: [PATCH] Update --- .gitignore | 3 +-- {scripts => localscripts}/dev-script.sh | 2 +- {scripts => localscripts}/git-push.sh | 0 {scripts => localscripts}/merge-dev-to-master.sh | 0 {scripts => localscripts}/merge-feature-to-dev.sh | 0 {scripts => localscripts}/new-feature.sh | 0 {scripts => localscripts}/stash.sh | 0 {scripts => localscripts}/switch-branch.sh | 4 ++-- 8 files changed, 4 insertions(+), 5 deletions(-) rename {scripts => localscripts}/dev-script.sh (99%) rename {scripts => localscripts}/git-push.sh (100%) rename {scripts => localscripts}/merge-dev-to-master.sh (100%) rename {scripts => localscripts}/merge-feature-to-dev.sh (100%) rename {scripts => localscripts}/new-feature.sh (100%) rename {scripts => localscripts}/stash.sh (100%) rename {scripts => localscripts}/switch-branch.sh (96%) diff --git a/.gitignore b/.gitignore index a6a463e..aaa097a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,4 @@ frontend/dist backend/node_modules backend/.env frontend/node_modules -docker-compose.dev.yml -scripts/docker-release.sh \ No newline at end of file +docker-compose.dev.yml \ No newline at end of file diff --git a/scripts/dev-script.sh b/localscripts/dev-script.sh similarity index 99% rename from scripts/dev-script.sh rename to localscripts/dev-script.sh index 0821fd7..81af0c9 100755 --- a/scripts/dev-script.sh +++ b/localscripts/dev-script.sh @@ -319,7 +319,7 @@ manage_stash() { } switch_branch() { - local -a unversioned_files=("scripts/dev-script.sh") + local -a unversioned_files=("localscripts/*") local file local local_branches remote_branches all_branches master_branch dev_branch feature_branches local -a sorted_branches diff --git a/scripts/git-push.sh b/localscripts/git-push.sh similarity index 100% rename from scripts/git-push.sh rename to localscripts/git-push.sh diff --git a/scripts/merge-dev-to-master.sh b/localscripts/merge-dev-to-master.sh similarity index 100% rename from scripts/merge-dev-to-master.sh rename to localscripts/merge-dev-to-master.sh diff --git a/scripts/merge-feature-to-dev.sh b/localscripts/merge-feature-to-dev.sh similarity index 100% rename from scripts/merge-feature-to-dev.sh rename to localscripts/merge-feature-to-dev.sh diff --git a/scripts/new-feature.sh b/localscripts/new-feature.sh similarity index 100% rename from scripts/new-feature.sh rename to localscripts/new-feature.sh diff --git a/scripts/stash.sh b/localscripts/stash.sh similarity index 100% rename from scripts/stash.sh rename to localscripts/stash.sh diff --git a/scripts/switch-branch.sh b/localscripts/switch-branch.sh similarity index 96% rename from scripts/switch-branch.sh rename to localscripts/switch-branch.sh index 8d6cfff..107f5ce 100755 --- a/scripts/switch-branch.sh +++ b/localscripts/switch-branch.sh @@ -3,7 +3,7 @@ # =============================== # Dateien sichern, die nicht gepusht werden # =============================== -UNVERSIONED_FILES=("scripts/docker-release.sh") +UNVERSIONED_FILES=("localscripts/*") for f in "${UNVERSIONED_FILES[@]}"; do if [[ -f $f ]]; then mkdir -p /tmp/git_safe_backup @@ -84,4 +84,4 @@ done rm -rf /tmp/git_safe_backup echo "Branch '$SELECTED_BRANCH' ist nun aktiv. Arbeitsverzeichnis entspricht exakt dem Remote-Stand." -echo "Unversionierte Dateien wurden wiederhergestellt." \ No newline at end of file +echo "Unversionierte Dateien wurden wiederhergestellt."