daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ps bug

Browse Source
This commit is contained in:
Nick Peng
2019-06-20 22:36:04 +08:00
parent ef50ea9c5e
commit 99972c36ad
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/optware/S50smartdns
View File

@@ -52,7 +52,7 @@ clear_iptable()
restart_dnsmasq() restart_dnsmasq()
{ {
CMD="`ps | grep " dnsmasq" | grep -v grep 2>/dev/null`" CMD="`ps | grep "dnsmasq" | grep -v grep 2>/dev/null`"
if [ -z "$CMD" ]; then if [ -z "$CMD" ]; then
CMD="`ps ax | grep dnsmasq | grep -v grep 2>/dev/null`" CMD="`ps ax | grep dnsmasq | grep -v grep 2>/dev/null`"
fi fi
@@ -157,10 +157,10 @@ set_smartdns_port()
return 0 return 0
elif [ "$SMARTDNS_WORKMODE" = "1" ]; then elif [ "$SMARTDNS_WORKMODE" = "1" ]; then
sed -i "s/^\(bind .*\):53 *\(.*\)\$/\1:$SMARTDNS_PORT \2/g" $SMARTDNS_CONF sed -i "s/^\(bind .*\):53 *\(.*\)\$/\1:$SMARTDNS_PORT \2/g" $SMARTDNS_CONF
sed -i "s/^\(bind-tcp .*\):53 *\(.*\)\$/\1:$SMARTDNS_PORT \2/g" $SMARTDNS_CONF sed -i "s/^\(bind-tcp .*\):53 *\(.*\)\$/\1:$SMARTDNS_PORT \2/g" $SMARTDNS_CONF
elif [ "$SMARTDNS_WORKMODE" = "2" ]; then elif [ "$SMARTDNS_WORKMODE" = "2" ]; then
sed -i "s/^\(bind .*\):$SMARTDNS_PORT *\(.*\)\$/\1:53 \2/g" $SMARTDNS_CONF sed -i "s/^\(bind .*\):$SMARTDNS_PORT *\(.*\)\$/\1:53 \2/g" $SMARTDNS_CONF
sed -i "s/^\(bind-tcp .*\):$SMARTDNS_PORT *\(.*\)\$/\1:53 \2/g" $SMARTDNS_CONF sed -i "s/^\(bind-tcp .*\):$SMARTDNS_PORT *\(.*\)\$/\1:53 \2/g" $SMARTDNS_CONF
else else
return 1 return 1
fi fi