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 25ac25c..2c98433 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 @@ -78,6 +78,7 @@ $(echo "Currently: " && $package_dir/$1.sh -I && echo "\Zuinstalled\Zn" || $([ -n "$($package_dir/$1.sh -E)" ] && $package_dir/$1.sh -I && echo "Service status: \Zu$(femto-utils.sh -C "$($package_dir/$1.sh -E)" | sed 's/\x1b\[[0-9;]*m//g')\Zn\n")\ $(if output=$($package_dir/$1.sh -L); [ -n "$output" ]; then echo "Installs to: \Zu$output\Zn\n"; fi)\ $(if output=$($package_dir/$1.sh -C); [ -n "$output" ]; then echo "Conflicts with: \Zu$output\Zn\n"; fi)\ +$(if output=$($package_dir/$1.sh -T); [ -n "$output" ]; then echo "License: \Zu$output\Zn\n"; fi)\ $(if $package_dir/$1.sh -O | grep -q 'U'; then echo "\nFor more information, visit $($package_dir/$1.sh -U)"; fi)" 0 0 [ $? -eq 1 ] && return 1 # Exit the loop if the user selects "Cancel" or closes the dialog package_menu $1 # after user hits "OK", move on to package menu diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/contact_client.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/contact_client.sh index 734ea70..9ed3b72 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/contact_client.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/contact_client.sh @@ -31,6 +31,7 @@ Arguments: -E Get service name -L Get install location -G Get license +-T Get license name -P Get package name -C Get Conflicts -I Check if installed. Returns an error if not installed @@ -52,11 +53,12 @@ name="Contact" # software name author="pdxlocations" # software author - OPTIONAL description="A Text-Based Console UI for Meshtastic Nodes. Formerly called Curse Client.\nAfter install, run \`contact\` to launch." # software description - OPTIONAL (but strongly recommended!) URL="https://github.com/pdxlocations/contact/" # software URL. Can contain multiple URLs - OPTIONAL -options="xiuglNADUOLGCI" # script options in use by software package. For example, for a package with no service, exclude `edsrS` +options="xiuglNADUOLGTCI" # script options in use by software package. For example, for a package with no service, exclude `edsrS` launch="python /opt/contact/main.py --host" # command to launch software, if applicable service_name="" # the name of the service/s, such as `chrony`. REQUIRED if service options are in use. If multiple services, separate by spaces "service1 service2" location="/opt/contact" # install location REQUIRED if not apt installed. Generally, we use `/opt/software-name` license="$location/LICENSE" # file to cat to display license +license_name="GPL3" # license name, such as MIT, GPL3, custom, whatever. short text string. conflicts="" # comma delineated plain-text list of packages with which this package conflicts. Blank if none. Use the name as it appears in the $name field of the other package. Extra plaintext is allowed, such as "packageA, packageB, any other software that uses the Meshtastic CLI" @@ -171,6 +173,9 @@ while getopts ":h$options" opt; do G) # Option -G (Get license) license ;; + T) # Option -T (Get license name) + echo $license_name + ;; C) echo -e $conflicts ;; I) # Option -I (Check if already installed) check diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/meshing_around.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/meshing_around.sh index 303349c..d473fc2 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/meshing_around.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/meshing_around.sh @@ -36,6 +36,7 @@ Arguments: -E Get service name -L Get install location -G Get license +-T Get license name -P Get package name -C Get Conflicts -I Check if installed. Returns an error if not installed @@ -56,11 +57,12 @@ name="Meshing Around" # software name author="Spud" # software author - OPTIONAL description="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." # software description - OPTIONAL (but strongly recommended!) URL="https://github.com/SpudGunMan/meshing-around" # software URL. Can contain multiple URLs - OPTIONAL -options="xiuagedsrNADUOSELGCI" # script options in use by software package. For example, for a package with no service, exclude `edsr` +options="xiuagedsrNADUOSELGTCI" # script options in use by software package. For example, for a package with no service, exclude `edsr` launch="" # command to launch software, if applicable service_name="mesh_bot pong_bot mesh_bot_reporting" # the name of the service, such as `chrony`. REQUIRED if service options are in use. If multiple services, separate by spaces "service1 service2" location="/opt/meshing-around" # install location REQUIRED if not apt installed. Generally, we use `/opt/software-name` license="$location/LICENSE" # file to cat to display license +license_name="GPL3" # license name, such as MIT, GPL3, custom, whatever. short text string conflicts="TC²-BBS, any other \"full control\" style bots" # comma delineated plain-text list of packages with which this package conflicts. Use the name as it appears in the $name field of the other package. Extra plaintext is allowed, such as "packageA, packageB, any other software that uses the Meshtastic CLI" # install script @@ -183,6 +185,9 @@ while getopts ":h$options" opt; do G) # Option -G (Get license) license ;; + T) # Option -T (Get license name) + echo $license_name + ;; C) echo -e $conflicts ;; I) # Option -I (Check if already installed) check diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/mosquitto_mqtt_broker.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/mosquitto_mqtt_broker.sh index 12d207c..abc0bae 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/mosquitto_mqtt_broker.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/mosquitto_mqtt_broker.sh @@ -36,6 +36,7 @@ Arguments: -E Get service name -L Get install location -G Get license +-T Get license name -P Get package name -C Get Conflicts -I Check if installed. Returns an error if not installed @@ -57,12 +58,13 @@ name="Mosquitto MQTT Broker" # software name author="Eclipse Foundation" # software author - OPTIONAL description="Eclipse Mosquitto is an open source (EPL/EDL licensed) message broker that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1. Mosquitto is lightweight and is suitable for use on all devices from low power single board computers to full servers.\n\nThe MQTT protocol provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for Internet of Things messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers.\n\nThe Mosquitto project also provides a C library for implementing MQTT clients, and the very popular mosquitto_pub and mosquitto_sub command line MQTT clients.\n\nMosquitto is part of the Eclipse Foundation, and is an iot.eclipse.org project. The development is driven by Cedalo." # software description - OPTIONAL (but strongly recommended!) URL="https://mosquitto.org/" # software URL. Can contain multiple URLs - OPTIONAL -options="xiugedsrNADUOSEGPCI" # script options in use by software package. For example, for a package with no service, exclude `edsr` +options="xiugedsrNADUOSEGTPCI" # script options in use by software package. For example, for a package with no service, exclude `edsr` launch="" # command to launch software, if applicable service_name="mosquitto" # the name of the service/s, such as `chrony`. REQUIRED if service options are in use. If multiple services, separate by spaces "service1 service2" package_name="mosquitto" # apt package name, if applicable location="" # install location REQUIRED if not apt installed. Generally, we use `/opt/software-name` license="usr/share/doc/mosquitto/copyright" # file to cat to display license +license_name="EPL/EDL" # license name, such as MIT, GPL3, custom, whatever. short text string conflicts="" # comma delineated plain-text list of packages with which this package conflicts. Blank if none. Use the name as it appears in the $name field of the other package. Extra plaintext is allowed, such as "packageA, packageB, any other software that uses the Meshtastic CLI" # install script @@ -155,6 +157,9 @@ while getopts ":h$options" opt; do G) # Option -G (Get license) license ;; + T) # Option -T (Get license name) + echo $license_name + ;; P) echo -e $package_name ;; C) echo -e $conflicts ;; I) # Option -I (Check if already installed) diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/mosquitto_mqtt_client.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/mosquitto_mqtt_client.sh index c49c456..e75dc52 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/mosquitto_mqtt_client.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/mosquitto_mqtt_client.sh @@ -36,6 +36,7 @@ Arguments: -E Get service name -L Get install location -G Get license +-T Get license name -P Get package name -C Get Conflicts -I Check if installed. Returns an error if not installed @@ -57,11 +58,12 @@ name="Mosquitto MQTT Client" # software name author="Eclipse Foundation" # software author - OPTIONAL description="Eclipse Mosquitto is an open source (EPL/EDL licensed) message broker that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1. Mosquitto is lightweight and is suitable for use on all devices from low power single board computers to full servers.\n\nThe MQTT protocol provides a lightweight method of carrying out messaging using a publish/subscribe model. This makes it suitable for Internet of Things messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers.\n\nThe Mosquitto project also provides a C library for implementing MQTT clients, and the very popular mosquitto_pub and mosquitto_sub command line MQTT clients.\n\nMosquitto is part of the Eclipse Foundation, and is an iot.eclipse.org project. The development is driven by Cedalo." # software description - OPTIONAL (but strongly recommended!) URL="https://mosquitto.org/" # software URL. Can contain multiple URLs - OPTIONAL -options="xiugedsrNADUOSEGPCI" # script options in use by software package. For example, for a package with no service, exclude `edsr` +options="xiugedsrNADUOSEGTPCI" # script options in use by software package. For example, for a package with no service, exclude `edsr` launch="" # command to launch software, if applicable service_name="" # the name of the service/s, such as `chrony`. REQUIRED if service options are in use. If multiple services, separate by spaces "service1 service2" location="" # install location REQUIRED if not apt installed. Generally, we use `/opt/software-name` license="usr/share/doc/mosquitto-clients/copyright" # file to cat to display license +license_name="EPL/EDL" # license name, such as MIT, GPL3, custom, whatever. short text string package_name="mosquitto-clients" # apt package name, if applicable conflicts="" # comma delineated plain-text list of packages with which this package conflicts. Blank if none. Use the name as it appears in the $name field of the other package. Extra plaintext is allowed, such as "packageA, packageB, any other software that uses the Meshtastic CLI" @@ -153,6 +155,9 @@ while getopts ":h$options" opt; do G) # Option -G (Get license) license ;; + T) # Option -T (Get license name) + echo $license_name + ;; P) echo -e $package_name ;; C) echo -e $conflicts ;; I) # Option -I (Check if already installed) diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/package_template.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/package_template.sh index 1a6338a..032d2ae 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/package_template.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/package_template.sh @@ -36,6 +36,7 @@ Arguments: -E Get service name -L Get install location -G Get license +-T Get license name -P Get package name -C Get Conflicts -I Check if installed. Returns an error if not installed @@ -56,13 +57,14 @@ name="name" # software name author="author" # software author - OPTIONAL description="description" # software description - OPTIONAL (but strongly recommended!) URL="URL" # software URL. Can contain multiple URLs - OPTIONAL -options="hxiuagedsrlNADUOSELGPCI" # script options in use by software package. For example, for a package with no service, exclude `edsrS` +options="hxiuagedsrlNADUOSELGTPCI" # script options in use by software package. For example, for a package with no service, exclude `edsrS` launch="/opt/package/run.sh" # command to launch software, if applicable license="/opt/package/license" # file to cat to display license service_name="service_name" # the name of the service/s, such as `chrony`. REQUIRED if service options are in use. If multiple services, separate by spaces "service1 service2" package_name="apt_package" # apt package name, if applicable. Can be multiple packages separated by spaces, but if at least one is installed the package will show as "installed" even if the others aren't location="/opt/location" # install location REQUIRED if not apt installed. Generally, we use `/opt/software-name` license="$location/LICENSE" # file to cat to display license +license_name="GPL3" # license name, such as MIT, GPL3, custom, whatever. short text string conflicts="package1, package2" # comma delineated plain-text list of packages with which this package conflicts. Blank if none. Use the name as it appears in the $name field of the other package. Extra plaintext is allowed, such as "packageA, packageB, any other software that uses the Meshtastic CLI" # install script @@ -164,6 +166,9 @@ while getopts ":$options" opt; do G) # Option -G (Get license) license ;; + T) # Option -T (Get license name) + echo $license_name + ;; P) echo -e $package_name ;; C) echo -e $conflicts ;; I) # Option -I (Check if already installed) diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/samba.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/samba.sh index c77bf8a..d8148ae 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/samba.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/samba.sh @@ -36,6 +36,7 @@ Arguments: -E Get service name -L Get install location -G Get license +-T Get license name -P Get package name -C Get Conflicts -I Check if installed. Returns an error if not installed @@ -59,11 +60,12 @@ name="Samba File Sharing" # software name author="Software Freedom Conservancy" # software author - OPTIONAL description="Femtofox comes with Samba preinstalled but disabled. $init_instructions\n\n$user_message" # software description - OPTIONAL (but strongly recommended!) URL="https://www.samba.org/" # software URL. Can contain multiple URLs - OPTIONAL -options="xiuagedsrNADUOSEGPCI" # script options in use by software package. For example, for a package with no service, exclude `edsr` +options="xiuagedsrNADUOSEGTPCI" # script options in use by software package. For example, for a package with no service, exclude `edsr` launch="" # command to launch software, if applicable service_name="smbd nmbd" # the name of the service/s, such as `chrony`. REQUIRED if service options are in use. If multiple services, separate by spaces "service1 service2" location="" # install location REQUIRED if not apt installed. Generally, we use `/opt/software-name` license="/usr/share/doc/samba/copyright" # file to cat to display license +license_name="GPL3" # license name, such as MIT, GPL3, custom, whatever. short text string package_name="samba" # apt package name, if applicable conflicts="" # comma delineated plain-text list of packages with which this package conflicts. Blank if none. Use the name as it appears in the $name field of the other package. Extra plaintext is allowed, such as "packageA, packageB, any other software that uses the Meshtastic CLI" @@ -172,6 +174,9 @@ while getopts ":h$options" opt; do G) # Option -G (Get license) license ;; + T) # Option -T (Get license name) + echo $license_name + ;; P) echo -e $package_name ;; C) echo -e $conflicts ;; I) # Option -I (Check if already installed) diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/tc2_bbs.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/tc2_bbs.sh index 560742b..b8ccc12 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/tc2_bbs.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/tc2_bbs.sh @@ -36,6 +36,7 @@ Arguments: -E Get service name -L Get install location -G Get license +-T Get license name -P Get package name -C Get Conflicts -I Check if installed. Returns an error if not installed @@ -57,11 +58,12 @@ name="TC²-BBS" # software name author="The Comms Channel" # software author - OPTIONAL description="The TC²-BBS system integrates with Meshtastic devices. The system allows for message handling, bulletin boards, mail systems, and a channel directory." # software description - OPTIONAL (but strongly recommended!) URL="https://github.com/TheCommsChannel/TC2-BBS-mesh" # software URL. Can contain multiple URLs - OPTIONAL -options="xiugedsrNADUOSELGCI" # script options in use by software package. For example, for a package with no service, exclude `edsr` +options="xiugedsrNADUOSELGTCI" # script options in use by software package. For example, for a package with no service, exclude `edsr` launch="python /opt/TC2-BBS-mesh/server.py" # command to launch software, if applicable service_name="mesh-bbs" # the name of the service/s, such as `chrony`. REQUIRED if service options are in use. If multiple services, separate by spaces "service1 service2" location="/opt/TC2-BBS-mesh" # install location REQUIRED if not apt installed. Generally, we use `/opt/software-name` license="$location/LICENSE" # file to cat to display license +license_name="GPL3" # license name, such as MIT, GPL3, custom, whatever. short text string conflicts="Meshing Around, other \"full control\" packages" # comma delineated plain-text list of packages with which this package conflicts. Blank if none. Use the name as it appears in the $name field of the other package. Extra plaintext is allowed, such as "packageA, packageB, any other software that uses the Meshtastic CLI" # install script @@ -180,6 +182,9 @@ while getopts ":h$options" opt; do G) # Option -G (Get license) license ;; + T) # Option -T (Get license name) + echo $license_name + ;; C) echo -e $conflicts ;; I) # Option -I (Check if already installed) check diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/ttyd.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/ttyd.sh index 38a588c..6d284c9 100755 --- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/ttyd.sh +++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/packages/ttyd.sh @@ -36,11 +36,10 @@ Arguments: -E Get service name -L Get install location -G Get license +-T Get license name -P Get package name -C Get Conflicts -I Check if installed. Returns an error if not installed - Custom for this package: --k Generate/overwrite ttyd encryption keys EOF ) @@ -58,12 +57,13 @@ name="ttyd Web Terminal" # software name author="Shuanglei Tao" # software author - OPTIONAL description="ttyd is a simple command-line tool for sharing terminal over the web.\n\nWhen running, ttyd is available at https://$(hostname).local:7681\nttyd is installed and enabled by default on Foxbuntu.\n\nSSL encryption is provided by keys generated during first-boot or during installation. Your browser may give a warning (net::ERR_CERT_AUTHORITY_INVALID) about the self-signed encryption certificate. This is normal. In Chromium (Chrome, Edge) click \"Advanced\" and \"Continue to femtofox.local (unsafe)\"" # software description - OPTIONAL (but strongly recommended!) URL="https://github.com/tsl0922/ttyd" # software URL. Can contain multiple URLs - OPTIONAL -options="hxiugedsrNADUOSELGCIk" # script options in use by software package. For example, for a package with no service, exclude `edsrS` +options="hxiugedsrNADUOSELGTCIk" # script options in use by software package. For example, for a package with no service, exclude `edsrS` launch="" # command to launch software, if applicable service_name="ttyd" # the name of the service/s, such as `chrony`. REQUIRED if service options are in use. If multiple services, separate by spaces "service1 service2" package_name="" # apt package name, if applicable. Can be multiple packages separated by spaces, but if at least one is installed the package will show as "installed" even if the others aren't location="/opt/ttyd" # install location REQUIRED if not apt installed. Generally, we use `/opt/software-name` license="$location/LICENSE" # file to cat to display license +license_name="MIT" # license name, such as MIT, GPL3, custom, whatever. short text string conflicts="" # comma delineated plain-text list of packages with which this package conflicts. Blank if none. Use the name as it appears in the $name field of the other package. Extra plaintext is allowed, such as "packageA, packageB, any other software that uses the Meshtastic CLI" # install script @@ -189,6 +189,9 @@ while getopts ":$options" opt; do G) # Option -G (Get license) license ;; + T) # Option -T (Get license name) + echo $license_name + ;; P) echo -e $package_name ;; C) echo -e $conflicts ;; I) # Option -I (Check if already installed)