From 6714a79eb5ae9501b4b386ca6fc39aecd5c32435 Mon Sep 17 00:00:00 2001 From: nagumii Date: Fri, 10 Jan 2025 22:12:22 +0200 Subject: [PATCH] add install location variable --- .../usr/local/bin/femto-software.sh | 8 ++++---- .../usr/local/bin/software/meshing_around.sh | 7 ++++++- .../usr/local/bin/software/software_template.sh | 16 ++++++++++++---- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-software.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-software.sh index 4e159b2..102dece 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-software.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-software.sh @@ -5,7 +5,7 @@ export LANG=C.UTF-8 # build and display package intro, then load package menu package_intro() { - dialog --title "$software" --msgbox "\ + dialog --title "Software Manager" --msgbox "\ $(/usr/local/bin/software/$1.sh -N)\n\ $(if /usr/local/bin/software/$1.sh -O | grep -q 'A'; then echo -e "by $(/usr/local/bin/software/$1.sh -A)"; fi)\n\ \n\ @@ -29,7 +29,7 @@ package_menu() { $(if /usr/local/bin/software/$1.sh -O | grep -q 's'; then echo "Stop service x"; fi) \ $(if /usr/local/bin/software/$1.sh -O | grep -q 'r'; then echo "Start/restart service x"; fi) \ "" "" \ - "Exit" "" 3>&1 1>&2 2>&3) + "Back" "" 3>&1 1>&2 2>&3) exit_status=$? # This line checks the exit status of the dialog command @@ -45,14 +45,14 @@ package_menu() { "Disable service") eval "/usr/local/bin/software/$1.sh -d" ;; "Stop service") eval "/usr/local/bin/software/$1.sh -s" ;; "Start/restart service") eval "/usr/local/bin/software/$1.sh -r" ;; - "Back") break ;; + "Back to software manager") break ;; esac done } while true; do -title="Software" +title="Software Manager" option="" option=$(dialog --cancel-label "Back" --menu "$title" 0 0 6 \ 1 "Meshing Around by Spud" \ diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/software/meshing_around.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/software/meshing_around.sh index 77ce232..da36b08 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/software/meshing_around.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/software/meshing_around.sh @@ -6,7 +6,8 @@ fi args="$@" help=$(cat <