bugfix: sed handle / replacement failed

modouwifi · Sep 25, 2014 · a89b57f · a89b57f
1 parent fc89d07
commit a89b57f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/init b/init
@@ -1,4 +1,5 @@
 #!/bin/sh
+#set -x
 
 config="/system/conf/dnsmasq.conf";
 curdir=$(cd $(dirname $0) && pwd)
@@ -12,13 +13,15 @@ usage() {
 
 delConfDir() {
     /system/sbin/writesys.sh
-    /bin/sed -ie "/conf-dir=$hdnsconf/d" $config 1>/dev/null 2>&1
+    local hdnsdir=`echo "$curdir/conf" | sed -e 's:/:\\\\/:g'`
+    /bin/sed -ie "/conf-dir=$hdnsdir/d" $config 1>/dev/null 2>&1
     /system/sbin/writesys.sh close
 }
 
 addConfDir() {
     /system/sbin/writesys.sh
-    /bin/sed -ie "/conf-dir=$hdnsconf/d" $config 1>/dev/null 2>&1
+    local hdnsdir=`echo "$curdir/conf" | sed -e 's:/:\\\\/:g'`
+    /bin/sed -ie "/conf-dir=$hdnsdir/d" $config 1>/dev/null 2>&1
     echo $hdnsconf >> $config
     /system/sbin/writesys.sh close
 }
@@ -67,7 +70,7 @@ install(){
 # main
 if [ $# -lt 1 ]; then
     usage
-    exit -1
+    exit 1
 fi
 
 case "$1" in