Merge pull request #371 from femtofox/noon2

Increment foxbuntu version
This commit is contained in:
noon92 2025-02-26 20:07:47 +02:00 • committed by GitHub
commit 563160d522
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions

View file

@ -1,6 +1,6 @@
major=1
minor=0
patch=0
hotfix=
hotfix=RC3
# major, minor and patch must be numbers and populated. hotfix must be letters and can be blank.

View file

@ -109,11 +109,11 @@ log_message "Enabling meshtasticd service"
systemctl enable meshtasticd
#generate SSH keys
log_message "Generating new SSH encryption keys. This can take a couple minutes..."
log_message "Generating new SSH encryption keys. This can take a few minutes..."
femto-utils.sh -E
#generate ttyd SSL keys
log_message "Generating new Web Terminal (ttyd) SSL encryption keys. This can take a couple minutes..."
log_message "Generating new Web Terminal (ttyd) SSL encryption keys. This can take a few minutes..."
/usr/local/bin/packages/ttyd.sh -k
log_message "Enabling Web Terminal (ttyd) service..."
systemctl enable ttyd

View file

@ -284,7 +284,7 @@ while getopts ":harsl:ipcnoSEC:R:v" opt; do
replace_colors "$OPTARG"
;;
v) # get foxbuntu version)
echo "Foxbuntu v$(grep -oP 'major=\K[0-9]+' /etc/foxbuntu-release).$(grep -oP 'minor=\K[0-9]+' /etc/foxbuntu-release).$(grep -oP 'patch=\K[0-9]+' /etc/foxbuntu-release)$(grep -oP 'hotfix=\K[a-z]+' /etc/foxbuntu-release)"
echo "Foxbuntu v$(grep -oP 'major=\K[0-9]+' /etc/foxbuntu-release).$(grep -oP 'minor=\K[0-9]+' /etc/foxbuntu-release).$(grep -oP 'patch=\K[0-9]+' /etc/foxbuntu-release)$(grep -oP 'hotfix=\K\S+' /etc/foxbuntu-release)"
;;
\?) # Unknown argument)
echo -e "Unknown argument $1.\n$help"