From 01e574bfd0e61b1eace4d8de8064982aec474f2f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 30 Aug 2022 13:05:55 +0200
Subject: [PATCH] sysutils/nut: convert to NAME_setup use

PR: https://github.com/opnsense/core/issues/5917
---
 sysutils/nut/Makefile                                     | 1 +
 .../src/opnsense/service/conf/actions.d/actions_nut.conf  | 8 ++++----
 .../nut/src/opnsense/service/templates/OPNsense/Nut/nut   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 1e9315072..ab7e34d89 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		nut
 PLUGIN_VERSION=		1.8.1
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		Network UPS Tools
 PLUGIN_DEPENDS=		nut
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/sysutils/nut/src/opnsense/service/conf/actions.d/actions_nut.conf b/sysutils/nut/src/opnsense/service/conf/actions.d/actions_nut.conf
index d7ae051a5..65816a99d 100644
--- a/sysutils/nut/src/opnsense/service/conf/actions.d/actions_nut.conf
+++ b/sysutils/nut/src/opnsense/service/conf/actions.d/actions_nut.conf
@@ -1,23 +1,23 @@
 [start]
-command:/usr/local/opnsense/scripts/OPNsense/Nut/setup.sh;/usr/local/etc/rc.d/nut start;/usr/local/etc/rc.d/nut_upsmon start
+command:/usr/local/etc/rc.d/nut start; /usr/local/etc/rc.d/nut_upsmon start
 parameters:
 type:script
 message:starting nut
 
 [stop]
-command:/usr/local/etc/rc.d/nut stop;/usr/local/etc/rc.d/nut_upsmon stop
+command:/usr/local/etc/rc.d/nut stop; /usr/local/etc/rc.d/nut_upsmon stop
 parameters:
 type:script
 message:stopping nut
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/Nut/setup.sh;/usr/local/etc/rc.d/nut restart;/usr/local/etc/rc.d/nut_upsmon restart
+command:/usr/local/etc/rc.d/nut restart; /usr/local/etc/rc.d/nut_upsmon restart
 parameters:
 type:script
 message:restarting nut
 
 [status]
-command:/usr/local/etc/rc.d/nut_upsmon status;exit 0
+command:/usr/local/etc/rc.d/nut_upsmon status; exit 0
 parameters:
 type:script_output
 message:request nut status
diff --git a/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/nut b/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/nut
index 8015ac6dd..57744d582 100644
--- a/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/nut
+++ b/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/nut
@@ -1,5 +1,5 @@
 {% if helpers.exists('OPNsense.Nut.general.enable') and OPNsense.Nut.general.enable == '1' %}
-nut_var_script="/usr/local/opnsense/scripts/OPNsense/Nut/setup.sh"
+nut_setup="/usr/local/opnsense/scripts/OPNsense/Nut/setup.sh"
 nut_enable="YES"
 {% else %}
 nut_enable="NO"