From 387bca9225ed26b7172f29895b322db8be581aa3 Mon Sep 17 00:00:00 2001 From: pi-farm Date: Thu, 25 Sep 2025 00:38:11 +0200 Subject: [PATCH] edit functions in edit_project menu --- scripts/image-builder.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/image-builder.sh b/scripts/image-builder.sh index 58732d0..250b216 100755 --- a/scripts/image-builder.sh +++ b/scripts/image-builder.sh @@ -250,6 +250,7 @@ edit_project() { projects=$(ls "$PROJECT_CONFIG_DIR" 2>/dev/null) [ -z "$projects" ] && { whiptail --msgbox "Keine Projekte vorhanden." 10 60; return; } + # Projekte für Menü vorbereiten (immer 2 Spalten) menu_list=() for p in $projects; do menu_list+=("$p" "") @@ -257,17 +258,18 @@ edit_project() { project=$(whiptail --menu "Projekt auswählen:" 20 60 10 "${menu_list[@]}" 3>&1 1>&2 2>&3) || return local config_file="$PROJECT_CONFIG_DIR/$project/config-file" + local project_dir="$PROJECTS_DIR/$project" while true; do repo_url=$(grep "^git_repo=" "$config_file" | cut -d= -f2) menu_items=( - 1 "Registry ändern" - 2 "Image-Name ändern" - 3 "Architekturen setzen" - 4 "Push-Option setzen" + 1 "Registries auswählen" + 2 "Architekturen auswählen" + 3 "Push aktivieren/deaktivieren" + 4 "Latest-Tag setzen/entfernen" 5 "Version/Subversion ändern" - 6 "Latest-Tag setzen" + 6 "Automatische Subversion" 7 "Projektdateien bearbeiten" ) @@ -281,14 +283,14 @@ edit_project() { 3>&1 1>&2 2>&3) || return case $choice in - 1) change_project_setting "$config_file" "registry" ;; - 2) change_project_setting "$config_file" "image_name" ;; - 3) change_project_setting "$config_file" "architectures" ;; - 4) change_project_setting "$config_file" "push" ;; + 1) edit_project_registries "$config_file" ;; + 2) edit_project_architectures "$config_file" ;; + 3) edit_project_push "$config_file" ;; + 4) edit_project_latest "$config_file" ;; 5) change_project_setting "$config_file" "version" ;; - 6) change_project_setting "$config_file" "latest" ;; + 6) edit_project_auto_subversion "$config_file" ;; 7) edit_project_files "$project" ;; - 8) [ -n "$repo_url" ] && (cd "$PROJECTS_DIR/$project" && git pull || whiptail --msgbox "Git Pull fehlgeschlagen." 10 60) ;; + 8) [ -n "$repo_url" ] && (cd "$project_dir" && git pull || whiptail --msgbox "Git Pull fehlgeschlagen." 10 60) ;; 0) return ;; esac done