From 4b0f43a902be872f0fb1895a30ac4f201fe89ef1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 20 Nov 2025 02:06:31 +0000 Subject: [PATCH 2/3] Fix typos and add error handling for curl command Co-authored-by: ShaYmez <76499782+ShaYmez@users.noreply.github.com> --- hblink3-docker-install.sh | 2 +- usr/local/sbin/flush | 2 +- usr/local/sbin/update | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hblink3-docker-install.sh b/hblink3-docker-install.sh index 0ad74ca..e5f9a70 100755 --- a/hblink3-docker-install.sh +++ b/hblink3-docker-install.sh @@ -47,7 +47,7 @@ then fi DIRDIR=$(pwd) LOCAL_IP=$(ip a | grep inet | grep "eth0\|en" | awk '{print $2}' | tr '/' ' ' | awk '{print $1}') -EXTERNAL_IP=$(curl https://ipecho.net/plain) +EXTERNAL_IP=$(curl -s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null || echo "Unable to detect") ARC=$(lscpu | grep Arch | awk '{print $2}') VERSION=$(sed 's/\..*//' /etc/debian_version) ARMv7l=https://get.docker.com | sh diff --git a/usr/local/sbin/flush b/usr/local/sbin/flush index 88dbd4d..365687c 100755 --- a/usr/local/sbin/flush +++ b/usr/local/sbin/flush @@ -87,7 +87,7 @@ echo "Flushing network tracking table....." conntrack -F sleep 1 -echo "Starting Dasdhboard....." +echo "Starting Dashboard....." systemctl restart hbmon figlet "HBMonv2" echo "Done." diff --git a/usr/local/sbin/update b/usr/local/sbin/update index a6e03a3..28b34c1 100755 --- a/usr/local/sbin/update +++ b/usr/local/sbin/update @@ -19,7 +19,7 @@ # Update containers / service clean/truncate/ and restart of services.. -LOCAL_IP=$(ip a | grep inet | grep "ens18\|en" | awk '{print $2}' | tr '/' ' ' | awk '{print $1}') +LOCAL_IP=$(ip a | grep inet | grep "eth0\|en" | awk '{print $2}' | tr '/' ' ' | awk '{print $1}') ARC=$(lscpu | grep Arch | awk '{print $2}') VERSION=$(sed 's/\..*//' /etc/debian_version) @@ -57,7 +57,7 @@ echo " You will need to edit your config and then run the following command " echo "" echo " Type 'hblink-menu' for main menu " echo " Use the menu to edit your server / config " -echo " Refur to the official HBlink Repo for more documentation " +echo " Refer to the official HBlink Repo for more documentation " echo " https://github.com/HBLink-org/hblink3 " echo "" echo " Check out the docker installer of HBlink3 here " From 541a9bf45ee0a58be1913ae4af077cf1b56882f1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 20 Nov 2025 02:07:44 +0000 Subject: [PATCH 3/3] Fix multiple typos in README documentation Co-authored-by: ShaYmez <76499782+ShaYmez@users.noreply.github.com> --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 67ff9bb..5a1dc7a 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ This is a multi-arch docker installer for HBlink3 and HBmonV2 combined for Debia Parrot is built into this install (Default disabled, see below how to enable the parrot feature! ### Destructive Installer -This is a destructive installer and is recomended to be built on a freshly installed machine running Debian 10 or 11. Please note this installer will not work on Debian 12 Bookworm!! +This is a destructive installer and is recommended to be built on a freshly installed machine running Debian 10 or 11. Please note this installer will not work on Debian 12 Bookworm!! ### Docker Multi-Arch build Docker container pre-built for multi-arch! @@ -27,7 +27,7 @@ This installer includes all the usual libs and packages including docker, apache install this on a 'clean machine'. The script is destructive and is not designed to be used on an exisiting machine that has other software on it! YOU HAVE BEEN WARNED! ### Prerequisite -The host system must be running dabian 10 or 11. Although this software may run on the latest debian platform, this installer has only been tested on debian 10 and 11. The installer may fail due to pip/python changes in debian 12. This script has been tested on most architectures but the system requires, at a minimum; 1 core, 512mbmb of ram, the required spec to run docker and additional procceses! The system must be up-to-date and have Git installed. You can install Git from the CLI. +The host system must be running Debian 10 or 11. Although this software may run on the latest debian platform, this installer has only been tested on debian 10 and 11. The installer may fail due to pip/python changes in debian 12. This script has been tested on most architectures but the system requires, at a minimum; 1 core, 512mb of ram, the required spec to run docker and additional processes! The system must be up-to-date and have Git installed. You can install Git from the CLI. Note* If you get Locale error(s) (LC_CTYPE=UTF-8, which is wrong) can happen when you login over ssh from a Mac to a linux box, and your terminal automatically sets environment variables. There's a checkbox for that. Uncheck it, and you're good to go. @@ -36,7 +36,7 @@ Make sure your system is up-to-date and pull Git from the apt repo. apt-get install -y git ``` ### Installation -1. Preferably a clean Dabian 10 or 11 system. Make sure your system is up to date with the latest apt repository database. You must be super user "root" to run this installer successfully. +1. Preferably a clean Debian 10 or 11 system. Make sure your system is up to date with the latest apt repository database. You must be super user "root" to run this installer successfully. ```sh apt update sudo su @@ -51,7 +51,7 @@ git clone https://github.com/ShaYmez/hblink3-docker-install cd hblink3-docker-install ./hblink3-docker-install.sh ``` -4. follow the install and any prompts! It it will prompt you for kernel updates if neccassary. +4. follow the install and any prompts! It will prompt you for kernel updates if necessary. 5. Once the installation is complete you will be presented with the first time run menu. Edit your config or exit to complete setup. ### New Menu System released with this installer! @@ -59,7 +59,7 @@ cd hblink3-docker-install ![New HBlink Menu System](img/HBLINK_menu.png "HBlink-menu") 6. Once the installation is complete you will be guided to the Setup Menu. To interact with this menu follow the on-screen -instructions! Set up and configure your system with the new menu system! Once finihsed hit 'Finish Setup & Exit' to exit out of the setup menu. +instructions! Set up and configure your system with the new menu system! Once finished hit 'Finish Setup & Exit' to exit out of the setup menu. 7. To enter the HBlink control menu, type the command ```sh @@ -151,7 +151,7 @@ nano /etc/hblink3/hblink.cfg ``` Scroll down to the ```[Parrot]``` stanza and edit ```ENABLED: True``` to enable. Next we have put an example rule in rules.py. Remove the ```#``` hashes to enable routing of the parrot. -'''sh +```sh nano /etc/hblink3/rules.py ``` Ctrl X and hit save! @@ -159,7 +159,7 @@ Once done save this and enter the the HBlink control menu ```sh hblink-menu ``` -Select option 4 "Update HBlinlk / Docker +Select option 4 "Update HBlink / Docker Watch the terminal for any errors while bringing up the project! You can use the parrot on TG9999 (Default) or edit for your own tastes! ### Postrequisite