diff --git a/package/lean/autocore/Makefile b/package/lean/autocore/Makefile index 5a3ea11321..207bfced80 100644 --- a/package/lean/autocore/Makefile +++ b/package/lean/autocore/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore PKG_VERSION:=1 -PKG_RELEASE:=29 +PKG_RELEASE:=30 include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/autocore/files/sbin/getcpu b/package/lean/autocore/files/sbin/getcpu index 4541477022..61e8d6ee43 100755 --- a/package/lean/autocore/files/sbin/getcpu +++ b/package/lean/autocore/files/sbin/getcpu @@ -1,7 +1,8 @@ #!/bin/sh -AT=$(cat /proc/stat | grep "^cpu " | awk '{print $2+$3+$4+$5+$6+$7+$8 " " $2+$3+$4+$7+$8}') -sleep 3 -BT=$(cat /proc/stat | grep "^cpu " | awk '{print $2+$3+$4+$5+$6+$7+$8 " " $2+$3+$4+$7+$8}') - -printf "%.01f%%" $(echo $AT $BT | awk '{print (($4-$2)/($3-$1))*100}') >/tmp/cpuusage \ No newline at end of file +if [ $(busybox ps -w | grep getcpu | grep -v grep | wc -l) -le 2 ]; then + AT=$(cat /proc/stat | grep "^cpu " | awk '{print $2+$3+$4+$5+$6+$7+$8 " " $2+$3+$4+$7+$8}') + sleep 1 + BT=$(cat /proc/stat | grep "^cpu " | awk '{print $2+$3+$4+$5+$6+$7+$8 " " $2+$3+$4+$7+$8}') + printf "%.01f%%" $(echo $AT $BT | awk '{print (($4-$2)/($3-$1))*100}') >/tmp/cpuusage +fi \ No newline at end of file diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 3c411d4ced..1d30ecf41f 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=174 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index a6bc4bdf2c..e9146582fa 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -577,7 +577,7 @@ start_server() { } start_local() { - local local_server=$(uci_get_by_type socks5_proxy server) + local local_server=$(uci_get_by_type socks5_proxy server nil) [ "$local_server" = "nil" ] && return 1 local local_type=$(uci_get_by_name $local_server type) mkdir -p /var/run /var/etc