🔨 Tweaks and improvements (#27)

* 🔨 Tweaks and improvements

* ✏️ Replace some Hass.io occurances

* ✏️ Typo

README.md

@@ -20,7 +20,7 @@
 [![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
 
 A Network UPS Tools daemon to allow you to easily manage battery backup (UPS)
-devices connected to your Hass.io machine.
+devices connected to your Home Assistant machine.
 
 ## About
 
@@ -92,7 +92,7 @@ devices:
     port: auto
     config: []
 mode: netserver
-shutdown_hassio: 'false'
+shutdown_host: 'false'
 ```
 
 **Note**: _This is just an example, don't copy and paste it! Create your own!_
@@ -216,9 +216,9 @@ Recognized values are `netserver` and `netclient`.
 - `netclient`: Only runs `upsmon` to connect to a remote system running as
   `netserver`.
 
-#### Option: `shutdown_hassio`
+#### Option: `shutdown_host`
 
-When this option is set to `true` on a UPS shutdown command, the Hassio system
+When this option is set to `true` on a UPS shutdown command, the host system
 will be shutdown. When set to `false` only the add-on will be stopped. This is to
 allow testing without impact to the system.
 

nut/.README.j2

@@ -7,7 +7,7 @@
 [![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
 
 A Network UPS Tools daemon to allow you to easily manage battery backup (UPS)
-devices connected to your Hass.io machine.
+devices connected to your Home Assistant machine.
 
 ## About
 

nut/Dockerfile

@@ -37,4 +37,4 @@ LABEL \
     org.label-schema.usage="https://github.com/hassio-addons/addon-nut/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-nut" \
-    org.label-schema.vendor="Community Hass.io Addons"
+    org.label-schema.vendor="Home Assistant Community Addons"

nut/config.json

@@ -36,7 +36,7 @@
       }
     ],
     "mode": "netserver",
-    "shutdown_hassio": "false"
+    "shutdown_host": "false"
   },
   "schema": {
     "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
@@ -58,7 +58,7 @@
       }
     ],
     "mode": "list(netserver|netclient)",
-    "shutdown_hassio": "bool",
+    "shutdown_host": "bool",
     "list_usb_devices": "bool?",
     "remote_ups_name": "str?",
     "remote_ups_host": "str?",

nut/rootfs/etc/cont-init.d/nut.sh

@@ -5,15 +5,11 @@
 # ==============================================================================
 readonly USERS_CONF=/etc/nut/upsd.users
 readonly UPSD_CONF=/etc/nut/upsd.conf
-declare upsmonpwd
 declare nutmode
+declare password
 declare shutdowncmd
+declare upsmonpwd
 declare username
-declare password
-
-# Fix permissions
-chmod -R 660 /etc/nut/*
-chown -R root:nut /etc/nut/*
 
 nutmode=$(bashio::config 'mode')
 bashio::log.info "Setting mode to ${nutmode}..."
@@ -25,20 +21,18 @@ if bashio::config.true 'list_usb_devices' ;then
 fi
 
 if bashio::config.equals 'mode' 'netserver' ;then
-
     bashio::log.info "Generating ${USERS_CONF}..."
+
     # Create Monitor User
     upsmonpwd=$(shuf -ze -n20  {A..Z} {a..z} {0..9}|tr -d '\0')
-
-        {
-            echo
-            echo "[upsmonmaster]"
-            echo "  password = ${upsmonpwd}"
-            echo "  upsmon master"
-        } >> "${USERS_CONF}"
+    {
+        echo
+        echo "[upsmonmaster]"
+        echo "  password = ${upsmonpwd}"
+        echo "  upsmon master"
+    } >> "${USERS_CONF}"
 
     for user in $(bashio::config "users|keys"); do
-
         bashio::config.require.username "users[${user}].username"
         username=$(bashio::config "users[${user}].username")
 
@@ -76,17 +70,17 @@ if bashio::config.equals 'mode' 'netserver' ;then
     fi
 
     for device in $(bashio::config "devices|keys"); do
-
         upsname=$(bashio::config "devices[${device}].name")
         upsdriver=$(bashio::config "devices[${device}].driver")
         upsport=$(bashio::config "devices[${device}].port")
+
         bashio::log.info "Configuring Device named ${upsname}..."
-            {
-                echo
-                echo "[${upsname}]"
-                echo "  driver = ${upsdriver}"
-                echo "  port = ${upsport}"
-            } >> /etc/nut/ups.conf
+        {
+            echo
+            echo "[${upsname}]"
+            echo "  driver = ${upsdriver}"
+            echo "  port = ${upsport}"
+        } >> /etc/nut/ups.conf
 
         OIFS=$IFS
         IFS=$'\n'
@@ -97,7 +91,6 @@ if bashio::config.equals 'mode' 'netserver' ;then
 
         echo "MONITOR ${upsname}@localhost 1 upsmonmaster ${upsmonpwd} master" \
             >> /etc/nut/upsmon.conf
-
     done
 
     if bashio::config.true "fake_usb_devices"; then
@@ -122,13 +115,12 @@ if bashio::config.equals 'mode' 'netserver' ;then
     else
         upsdrvctl start
     fi
-
 fi
 
 shutdowncmd="halt"
-if bashio::config.true 'shutdown_hassio'; then
-    bashio::log.warning "UPS Shutdown will shutdown Hassio"
-    shutdowncmd="/usr/bin/shutdownhassio"
+if bashio::config.true 'shutdown_host'; then
+    bashio::log.warning "UPS Shutdown will shutdown the host"
+    shutdowncmd="/usr/bin/shutdownhost"
 fi
 
 echo "SHUTDOWNCMD  ${shutdowncmd}" >> /etc/nut/upsmon.conf

nut/rootfs/etc/cont-init.d/nutclient.sh

@@ -6,20 +6,17 @@
 declare -a CONF_ENTRIES=("name" "host" "password" "user")
 
 if bashio::config.equals 'mode' 'netclient' ;then
-
     for entry in "${CONF_ENTRIES[@]}"; do
         if ! bashio::config.exists "remote_ups_${entry}";then
-        bashio::log.fatal \
-		"Netclient mode specified but no ${entry} is configured"
-		bashio::exit.nok
-	    fi
+        bashio::exit.nok \
+            "Netclient mode specified but no ${entry} is configured"
+        fi
     done
 
     rname=$(bashio::config "remote_ups_name")
     rhost=$(bashio::config "remote_ups_host")
     ruser=$(bashio::config "remote_ups_user")
     rpwd=$(bashio::config "remote_ups_password")
-
     echo "MONITOR ${rname}@${rhost} 1 ${ruser} ${rpwd} slave" \
         >> /etc/nut/upsmon.conf
 fi

nut/rootfs/etc/fix-attrs.d/nut

@@ -1,6 +1,6 @@
+/dev/bus/usb/*/* false root 0777 0777
+/etc/nut/* true root:nut 0660 0660
 /usr/bin/notify false root 0755 0755
+/usr/bin/shutdownhost false root 0755 0755
 /usr/bin/wall false root 0755 0755
-/usr/bin/shutdownhassio false root 0755 0755
 /var/run/nut false root:nut 0770 0770
-/etc/nut/* false root:nut 0660 0660
-/dev/bus/usb/*/* false root 0777 0777

nut/rootfs/etc/services.d/upsd/run

@@ -3,7 +3,9 @@
 # Home Assistant Community Add-on: Network UPS Tools
 # Run upsd
 # ==============================================================================
-if bashio::config.equals 'mode' 'netserver' ;then
-    bashio::log.info "Starting the UPS information server..."
-    exec upsd -D
+if ! bashio::config.equals 'mode' 'netserver' ;then
+    exec sleep 864000
 fi
+
+bashio::log.info "Starting the UPS information server..."
+exec upsd -D

nut/rootfs/usr/bin/shutdownhassio → nut/rootfs/usr/bin/shutdownhost

@@ -1,9 +1,6 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: Network UPS Tools
-# Script to shutdown Hassio from UPS Shutdowm Command
+# Script to shutdown the host from UPS Shutdown Command
 # ==============================================================================
-
-curl -sS -X "POST" \
-     -H "X-Supervisor-Token: ${SUPERVISOR_TOKEN}" \
-     "http://hassio/host/shutdown"
+bashio::host.shutdown