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

update to main

Browse Source
This commit is contained in:
Meliox 2024-06-05 23:47:22 +02:00
parent ed7cd5ca09
commit 3b1066b507
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,8 +38,12 @@ function msgb {
echo -e "\e[1m$1\e[0m" echo -e "\e[1m$1\e[0m"
} }
function info {
echo -e "\e[0;32m[info] $1\e[0m"
}
function warn { function warn {
echo -e "\e[0;33m[warning] $1\e[0m" echo -e "\e[0;93m[warning] $1\e[0m"
} }
function err { function err {
@ -184,8 +188,12 @@ function configure {
[fF]) [fF])
TEMP_UNIT="F" TEMP_UNIT="F"
;; ;;
"")
info "No unit selected. Temperatures will be presented in degrees Celsius."
TEMP_UNIT="C"
;;
*) *)
warn "Invalid selection. Temperatures will be presented in degrees Celsius." warn "Invalid unit selected. Temperatures will be presented in degrees Celsius."
TEMP_UNIT="C" TEMP_UNIT="C"
;; ;;
esac esac
@ -206,7 +214,6 @@ function configure {
enableSystemInfo=true enableSystemInfo=true
;; ;;
esac esac
echo # add a new line echo # add a new line
} }
@ -219,6 +226,7 @@ function install_mod {
# Create backup of original files # Create backup of original files
mkdir -p "$BACKUP_DIR" mkdir -p "$BACKUP_DIR"
local timestamp=$(date '+%Y-%m-%d_%H-%M-%S') local timestamp=$(date '+%Y-%m-%d_%H-%M-%S')
# Perform backup # Perform backup
@ -247,11 +255,15 @@ function install_mod {
if [[ "$enableSystemInfo" == true ]]; then if [[ "$enableSystemInfo" == true ]]; then
local systemInfoCmd=$(dmidecode -t 1 | awk -F': ' '/Manufacturer|Product Name|Serial Number/ {print $1": "$2}' | awk '{$1=$1};1' | sed 's/$/ |/' | paste -sd " " - | sed 's/ |$//') local systemInfoCmd=$(dmidecode -t 1 | awk -F': ' '/Manufacturer|Product Name|Serial Number/ {print $1": "$2}' | awk '{$1=$1};1' | sed 's/$/ |/' | paste -sd " " - | sed 's/ |$//')
sed -i "/my \$dinfo = df('\/', 1);/i\\\t\$res->{systemInfo} = \"$(echo "$systemInfoCmd")\";\n" "$nodespm" sed -i "/my \$dinfo = df('\/', 1);/i\\\t\$res->{systemInfo} = \"$(echo "$systemInfoCmd")\";\n" "$nodespm"
msg "SystemInfo output added to \"$nodespm\"." msg "System Information output added to \"$nodespm\"."
fi fi
# Add new item to the items array in PVE.node.StatusView # Add new item to the items array in PVE.node.StatusView
if [[ -z $(cat "$pvemanagerlibjs" | grep -e "itemId: 'thermal[[:alnum:]]*'") ]]; then if [[ -z $(cat "$pvemanagerlibjs" | grep -e "itemId: 'thermal[[:alnum:]]*'") ]]; then
# Create backup of original file
cp "$pvemanagerlibjs" "$BACKUP_DIR/pvemanagerlib.js.$timestamp"
msg "Backup of \"$pvemanagerlibjs\" saved to \"$BACKUP_DIR/pvemanagerlib.js.$timestamp\"."
local tempHelperCtorParams=$([[ "$TEMP_UNIT" = "F" ]] && echo '{srcUnit: PVE.mod.TempHelper.CELSIUS, dstUnit: PVE.mod.TempHelper.FAHRENHEIT}' || echo '{srcUnit: PVE.mod.TempHelper.CELSIUS, dstUnit: PVE.mod.TempHelper.CELSIUS}') local tempHelperCtorParams=$([[ "$TEMP_UNIT" = "F" ]] && echo '{srcUnit: PVE.mod.TempHelper.CELSIUS, dstUnit: PVE.mod.TempHelper.FAHRENHEIT}' || echo '{srcUnit: PVE.mod.TempHelper.CELSIUS, dstUnit: PVE.mod.TempHelper.CELSIUS}')
# Expand space in StatusView # Expand space in StatusView
sed -i "/Ext.define('PVE\.node\.StatusView'/,/\},/ { sed -i "/Ext.define('PVE\.node\.StatusView'/,/\},/ {
@ -348,22 +360,6 @@ Ext.define('PVE.mod.TempHelper', {\n\
}\n\ }\n\
},\n\ },\n\
});\n" "$pvemanagerlibjs" });\n" "$pvemanagerlibjs"
if [[ "$enableSystemInfo" == true ]]; then
sed -i "/^Ext.define('PVE.node.StatusView',/ {
:a;
/items:/!{N;ba;}
:b;
/'thermal.*},/!{N;bb;}
a\
\\
{\n\
xtype: 'box',\n\
colspan: 2,\n\
html: gettext('Drive(s)'),\n\
},
}" "$pvemanagerlibjs"
fi
sed -i "/^Ext.define('PVE.node.StatusView',/ { sed -i "/^Ext.define('PVE.node.StatusView',/ {
:a; :a;
@ -667,7 +663,6 @@ Ext.define('PVE.mod.TempHelper', {\n\
a\ a\
\\ \\
{\n\ {\n\
itemId: 'separatorBox',\n\
xtype: 'box',\n\ xtype: 'box',\n\
colspan: 2,\n\ colspan: 2,\n\
padding: '0 0 20 0',\n\ padding: '0 0 20 0',\n\
@ -732,7 +727,9 @@ Ext.define('PVE.mod.TempHelper', {\n\
restart_proxy restart_proxy
msg "Installation completed" msg "Installation completed."
info "Clear the browser cache to ensure all changes are visualized."
else else
warn "Sensor display items already added to the summary panel in \"$pvemanagerlibjs\"." warn "Sensor display items already added to the summary panel in \"$pvemanagerlibjs\"."
fi fi
@ -799,4 +796,4 @@ done
# If no arguments were provided or all arguments have been processed, print the usage message # If no arguments were provided or all arguments have been processed, print the usage message
if [[ $executed -eq 0 ]]; then if [[ $executed -eq 0 ]]; then
usage usage
fi fi