Merge pull request #10061 from ynezz/upstream/service-status-fix

treewide: fix service status
This commit is contained in:
Rosen Penev
2019-12-18 16:18:45 -08:00
committed by GitHub
8 changed files with 9 additions and 12 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=apfree-wifidog
PKG_VERSION:=3.11.1716
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/liudf0716/apfree_wifidog.git
+1 -1
View File
@@ -280,6 +280,6 @@ start_service() {
procd_close_instance
}
status() {
status_service() {
/usr/bin/wdctlx status
}
+1 -1
View File
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=simple-adblock
PKG_VERSION:=1.8.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
PKG_LICENSE:=GPL-3.0-or-later
+2 -2
View File
@@ -1028,9 +1028,9 @@ killcache() {
return 0
}
status() {
status_service() {
local status="$(tmpfs get status)" error="$(tmpfs get error)" message="$(tmpfs get message)"
if [ -n "$status" ] && [ -n "$message" ]; then
if [ -n "$status" ] && [ -n "$message" ]; then
status="${status}: $message"
fi
[ -n "$status" ] && output "$serviceName $status\\n"
+1 -1
View File
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=wifidog
PKG_VERSION:=1.3.0
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/wifidog/wifidog-gateway
+1 -1
View File
@@ -17,6 +17,6 @@ start_service() {
procd_close_instance
}
status() {
status_service() {
/usr/bin/wdctl status
}