From 4d39346fb4ca38e7c4b2f20735efb09b9eccb587 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 19 Sep 2020 16:52:58 -0700 Subject: [PATCH] nut: fix _ handling Taken from https://github.com/openwrt/packages/issues/13359 Signed-off-by: Rosen Penev --- net/nut/Makefile | 2 +- net/nut/files/nut-server.init | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/nut/Makefile b/net/nut/Makefile index f62ec8519e..c699fe260a 100644 --- a/net/nut/Makefile +++ b/net/nut/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nut PKG_VERSION:=2.7.4 -PKG_RELEASE:=20 +PKG_RELEASE:=21 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/ diff --git a/net/nut/files/nut-server.init b/net/nut/files/nut-server.init index a03d6b9cf8..7d550bda08 100755 --- a/net/nut/files/nut-server.init +++ b/net/nut/files/nut-server.init @@ -179,11 +179,11 @@ build_driver_config() { defoverride() { local overvar="$1" local defover="$2" - local overtype="$(echo "$overvar" | tr '.' '_')" + local overtype="$(echo "$overvar" | tr '_' '.')" local overval - config_get overval "${defover}_${overtype}" value - [ -n "$overval" ] && echo "${defover}.${overvar} = $overval" >>"$UPS_C" + config_get overval "${defover}_${overvar}" value + [ -n "$overval" ] && echo "${defover}.${overtype} = $overval" >>"$UPS_C" } config_list_foreach "$cfg" override defoverride override