From a2f79b7bd972f5b739ae7f17cf5965bcf56274ea Mon Sep 17 00:00:00 2001 From: nagumii Date: Sat, 4 Jan 2025 12:21:27 +0200 Subject: [PATCH] Corrections to meshing around install by @SpudGunMan --- .../usr/local/bin/femto-config | 29 ++++++++++--------- .../usr/local/bin/raspi-config | 9 ++---- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-config b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-config index 22166a7..e05601b 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-config +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/femto-config @@ -392,7 +392,7 @@ software_settings() { local title="Software" local option="" option=$(dialog --menu "$title" 0 0 6 \ - 1 "Meshing Around by Spudgudman" \ + 1 "Meshing Around by SpudGudMan" \ 2 "The Comms Channel BBS (TC2BBS)" \ "" ""\ 3 "Back to Main Menu" 3>&1 1>&2 2>&3) @@ -403,24 +403,25 @@ software_settings() { fi case $option in - 1) #About Femtofox) + 1) #Install Meshing Around) dialog --title "$software" --yesno "Meshing Around is a feature-rich bot designed to enhance your Meshtastic network experience with a variety of powerful tools and fun features, connectivity and utility through text-based message delivery. Whether you're looking to perform network tests, send messages, or even play games, mesh_bot.py has you covered.\nInstallation requires internet connection.\n\nLearn more at https://github.com/SpudGunMan/meshing-around\n\nInstall?" 0 0 - if [ $? -eq 0 ]; then #unless cancel/no - if git clone https://github.com/spudgunman/meshing-around /opt/meshing-around; then - /opt/meshing-around/install.sh #install script - dialog --title "$software" --cancel-label "Skip" --yesno "Installation complete!\n\nAdd Meshing Around as a system service?\nSystem services are run automatically on boot, and relaunched if they crash." 0 0 - if [ $? -eq 0 ]; then #unless cancel/no - echo "this is where we'd put the service stuff." - pause + #check if /opt/meshing-around exists if not git clone + if [ ! -d /opt/meshing-around ]; then + if [ $? -eq 0 ]; then #unless cancel/no + if git clone https://github.com/spudgunman/meshing-around /opt/meshing-around; then + /opt/meshing-around/install.sh #install script + dialog --title "$software" --msgbox "\nInstallation complete.\n\nRun \`sudo nano /opt/meshing-around/config.ini\` to configure, then relaunch the service with" 10 60 + else + dialog --title "$software" --msgbox "\nCloning of Meshing Around git repo failed.\nCheck internet connectivity." 10 60 fi - dialog --title "$software" --msgbox "\nInstallation complete.\n\nRun \`sudo nano /opt/meshing-around/config.ini\` to configure, then relaunch the service with" 10 60 - else - dialog --title "$software" --msgbox "\nCloning of Meshing Around git repo failed.\nCheck internet connectivity." 10 60 fi + else + /opt/meshing-around/install.sh #install script + dialog --title "$software" --msgbox "\nInstallation complete.\n\nRun \`sudo nano /opt/meshing-around/config.ini\` to configure, then relaunch the service with" 10 60 fi ;; - 2) #Display pinout) - femto_pinouts + 2) #Install TC2BBS) + echo "coming soon" ;; 3) return diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/raspi-config b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/raspi-config index 5d581c3..635a867 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/raspi-config +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/raspi-config @@ -1,8 +1,7 @@ #!/bin/bash RED='\033[31m' -RESET="\033[0m" # Reset to default color -# ASCII art stored in a variable -ascii_art=' +RESET="\033[0m" +echo -e ' $$$$$$$$$ @@$$$$$$$ $$$$$$$$$$$$$$@ @$$$$$$$$$$$$$ $$$$$$$$$$$$$$$$$$ $$$$$$$$$$$$$$$$$@ @@ -74,6 +73,4 @@ $$O ,~I {m$$$$$$$$$$$$@@@ @@@$@$$$$$$$$$$$$$$$$$$$$$$$ @@$$$$$$$$$$$$$$$$$$$$$@@ Silly fox! We have no '${RED}'raspberries'${RESET}' here! - Try `sudo femto-config`' - -echo -e "$ascii_art" \ No newline at end of file + Try `sudo femto-config`' \ No newline at end of file