OpenWRT
/
packages
mirror of https://github.com/openwrt/packages.git
1
0
Fork 0
Code Issues Releases Wiki Activity

treewide: use config_get_bool instead of config_get enabled 

The config_get_bool function parses not just the 1 but on/yes, true/false or enabled/disabled.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
pull/24218/head
Sergey Ponomarev 2024-05-11 10:30:21 +03:00 committed by Tianling Shen
parent b450fbc5ea
commit 4c4a7bd31d
17 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/atftp/Makefile
View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=atftp PKG_NAME:=atftp
PKG_VERSION:=0.8.0 PKG_VERSION:=0.8.0
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_SOURCE_URL:=@SF/$(PKG_NAME)

2
net/atftp/files/atftpd.init
View File

@ -11,7 +11,7 @@ start() {
config_load atftpd config_load atftpd
config_get enable service enable 0 config_get_bool enable service enable 0
[ "$enable" -eq "0" ] && return 0 [ "$enable" -eq "0" ] && return 0
config_get srv service path "/srv/tftp" config_get srv service path "/srv/tftp"

2
net/dcwapd/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dcwapd PKG_NAME:=dcwapd
PKG_VERSION:=1.1.0 PKG_VERSION:=1.1.0
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/ewsi/$(PKG_NAME)/tar.gz/v$(PKG_VERSION)?

2
net/dcwapd/files/dcwapd.init
View File

@ -254,7 +254,7 @@ start_service() {
config_load "$CONFIGURATION" config_load "$CONFIGURATION"
local enabled local enabled
config_get enabled general enabled config_get_bool enabled general enabled
if [ "$enabled" != "1" ]; then if [ "$enabled" != "1" ]; then
echo "dcwapd is disabled in UCI" echo "dcwapd is disabled in UCI"
return 1 return 1

2
net/dnsproxy/Makefile
View File

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsproxy PKG_NAME:=dnsproxy
PKG_VERSION:=0.71.1 PKG_VERSION:=0.71.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)?

2
net/dnsproxy/files/dnsproxy.init
View File

@ -9,7 +9,7 @@ PROG="/usr/bin/dnsproxy"
is_enabled() { is_enabled() {
local enabled local enabled
config_get enabled "$1" "$2" "0" config_get_bool enabled "$1" "$2" "0"
if [ "$enabled" -eq "1" ]; then if [ "$enabled" -eq "1" ]; then
return 0 return 0
else else

2
net/hs20/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hs20 PKG_NAME:=hs20
PKG_RELEASE:=9 PKG_RELEASE:=10
PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

2
net/hs20/files/hs20.init
View File

@ -170,7 +170,7 @@ EOF
start_service() { start_service() {
local enabled local enabled
config_load hs20 config_load hs20
config_get enabled server enabled config_get_bool enabled server enabled
[ "$enabled" != "1" ] && [ "$enabled" != "true" ] && exit 0 [ "$enabled" != "1" ] && [ "$enabled" != "true" ] && exit 0
echo "starting" echo "starting"

2
net/mwan3/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mwan3 PKG_NAME:=mwan3
PKG_VERSION:=2.11.13 PKG_VERSION:=2.11.13
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>, \ PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>, \
Aaron Goodman <aaronjg@alumni.stanford.edu> Aaron Goodman <aaronjg@alumni.stanford.edu>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

4
net/mwan3/files/lib/mwan3/mwan3.sh
View File

@ -43,7 +43,7 @@ mwan3_update_dev_to_table()
config_get family "$1" family ipv4 config_get family "$1" family ipv4
network_get_device device "$1" network_get_device device "$1"
[ -z "$device" ] && return [ -z "$device" ] && return
config_get enabled "$1" enabled config_get_bool enabled "$1" enabled
[ "$enabled" -eq 0 ] && return [ "$enabled" -eq 0 ] && return
curr_table=$(eval "echo \"\$mwan3_dev_tbl_${family}\"") curr_table=$(eval "echo \"\$mwan3_dev_tbl_${family}\"")
export "mwan3_dev_tbl_$family=${curr_table}${device}=$_tid " export "mwan3_dev_tbl_$family=${curr_table}${device}=$_tid "
@ -1087,7 +1087,7 @@ mwan3_report_iface_status()
mwan3_get_iface_id id "$1" mwan3_get_iface_id id "$1"
network_get_device device "$1" network_get_device device "$1"
config_get enabled "$1" enabled 0 config_get_bool enabled "$1" enabled 0
config_get family "$1" family ipv4 config_get family "$1" family ipv4
if [ "$family" = "ipv4" ]; then if [ "$family" = "ipv4" ]; then

2
net/mwan3/files/usr/libexec/rpcd/mwan3
View File

@ -104,7 +104,7 @@ get_mwan3_status() {
online=$(get_online_time "$iface") online=$(get_online_time "$iface")
offline=$(get_offline_time "$iface") offline=$(get_offline_time "$iface")
config_get enabled "$iface" enabled 0 config_get_bool enabled "$iface" enabled 0
if [ -f "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS" ]; then if [ -f "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS" ]; then
network_get_uptime uptime "$iface" network_get_uptime uptime "$iface"

2
net/natmap/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=natmap PKG_NAME:=natmap
PKG_VERSION:=20240303 PKG_VERSION:=20240303
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION)

2
net/natmap/files/natmap.init
View File

@ -10,7 +10,7 @@ STATUS_PATH=/var/run/natmap
load_interfaces() { load_interfaces() {
config_get interface "$1" interface config_get interface "$1" interface
config_get enable "$1" enable 1 config_get_bool enable "$1" enable 1
[ "${enable}" = "1" ] && interfaces=" ${interface} ${interfaces}" [ "${enable}" = "1" ] && interfaces=" ${interface} ${interfaces}"
} }

2
net/respondd/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=respondd PKG_NAME:=respondd
PKG_SOURCE_DATE:=2019-05-01 PKG_SOURCE_DATE:=2019-05-01
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/freifunk-gluon/respondd.git PKG_SOURCE_URL:=https://github.com/freifunk-gluon/respondd.git

2
net/respondd/files/respondd.init
View File

@ -11,7 +11,7 @@ multicast_group()
{ {
config_get group "$1" group config_get group "$1" group
config_get interfaces "$1" interface config_get interfaces "$1" interface
config_get disabled "$1" disabled 0 config_get_bool disabled "$1" disabled 0
if [ "$disabled" -gt "0" ]; then if [ "$disabled" -gt "0" ]; then
return return

2
utils/collectd/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=collectd PKG_NAME:=collectd
PKG_VERSION:=5.12.0 PKG_VERSION:=5.12.0
PKG_RELEASE:=50 PKG_RELEASE:=51
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://collectd.org/files/ \ PKG_SOURCE_URL:=https://collectd.org/files/ \

2
utils/collectd/files/collectd.init
View File

@ -466,7 +466,7 @@ process_plugins() {
local enable keys key option value local enable keys key option value
config_get enable "$cfg" enable 0 config_get_bool enable "$cfg" enable 0
[ "$enable" = "1" ] || return 0 [ "$enable" = "1" ] || return 0
[ -f "/usr/lib/collectd/$cfg.so" ] || { [ -f "/usr/lib/collectd/$cfg.so" ] || {