OpenSource/PVE-mods
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Color prompts (#57)

Browse Source 
* Implement function `ask` for prompts

* Declare response variable for temperature unit as local

* Rename user response variables (choice)
This commit is contained in:
eremem 2024-06-23 11:25:44 +02:00 committed by GitHub
parent 34c07fd2bc
commit f5ff837770
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pve-mod-gui-sensors.sh
View File

@ -58,6 +58,12 @@ function err {
echo -e "\e[0;31m[error] $1\e[0m"
exit 1
}
function ask {
read -p $'\n\e[0;32m'"$1:"$'\e[0m'" " response
echo $response
}
# End of helper functions
# Function to display usage information
@ -71,8 +77,8 @@ function install_packages {
# Check if the 'sensors' command is available on the system
if (! command -v sensors &>/dev/null); then
# If the 'sensors' command is not available, prompt the user to install lm-sensors
read -p "lm-sensors is not installed. Would you like to install it? (y/n) " choice
case "$choice" in
local choiceInstallLmSensors=$(ask "lm-sensors is not installed. Would you like to install it? (y/n)")
case "$choiceInstallLmSensors" in
[yY])
# If the user chooses to install lm-sensors, update the package list and install the package
apt-get update
@ -92,7 +98,7 @@ function install_packages {
}
function configure {
sensorsDetected=false
sensorsDetected=false # this is a global variable (see install_mod())
local sensorsOutput
if [ $DEBUG_REMOTE = true ]; then
@ -121,19 +127,21 @@ function configure {
if (echo "$sensorsOutput" | grep -q "coretemp-"); then
# Intel CPU
# Prompt user for which temperature to use
read -p "Do you wish to display temperatures for all cores [C] or just an average value(s) per CPU [a]? (C/a): " choice
case "$choice" in
local choiceTempDisplayType=$(ask "Do you wish to display temperatures for all cores [C] or just an average temperature per CPU [a]? (C/a)")
case "$choiceTempDisplayType" in
# Set temperature search criteria
[cC] | "")
if (echo "$sensorsOutput" | grep -A 10 "coretemp-" | grep -q "Core "); then
CPU_ITEM_PREFIX="Core "
CPU_TEMP_CAPTION="Core"
info "Temperatures will be displayed for all cores."
fi
;;
[aA])
if (echo "$sensorsOutput" | grep -A 10 "coretemp-" | grep -q "Package id "); then
CPU_ITEM_PREFIX="Package id"
CPU_TEMP_CAPTION="Package"
info "An average temperature will be displayed per CPU."
fi
;;
*)
@ -231,10 +239,8 @@ function configure {
fi
if [ $sensorsDetected = true ]; then
echo
read -p "Do you wish to display temperature readings in degrees Celsius [C] or Fahrenheit [f]? (C/f): " TEMP_UNIT
case "$TEMP_UNIT" in
local choiceTempUnit=$(ask "Do you wish to display temperatures in degrees Celsius [C] or Fahrenheit [f]? (C/f)")
case "$choiceTempUnit" in
[cC] | "")
TEMP_UNIT="C"
info "Temperatures will be presented in degrees Celsius."
@ -250,9 +256,8 @@ function configure {
esac
fi
echo
read -p "Do you wish to enable system information? (Y/n): " ENABLE_SYS_INFO
case "$ENABLE_SYS_INFO" in
local choiceEnableSystemInfo=$(ask "Do you wish to enable system information? (Y/n)")
case "$choiceEnableSystemInfo" in
[yY] | "")
enableSystemInfo=true
info "System information will be displayed..."
@ -859,8 +864,8 @@ function save_sensors_data {
msg "Sensors data will be saved in $filepath"
# Prompt user for confirmation
read -p "Do you wish to continue? (y/n): " choice
case "$choice" in
local choiceContinue=$(ask "Do you wish to continue? (y/n)")
case "$choiceContinue" in
[yY])
sensors -j >"$filepath"
msgb "Sensors data saved in $filepath."