Merge pull request #1248 from abcfy2/dev

添加 `.editorconfig` 配置，约束 `*.sh` 文件格式

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+
+[*.sh]
+indent_style = space
+indent_size = 4
+shell_variant = posix
+simplify = true
+switch_case_indent = true
+

scripts/starts/fw_getlanip.sh

@@ -1,9 +1,10 @@
-
 getlanip() { #获取局域网host地址
     i=1
     while [ "$i" -le "20" ]; do
-        host_ipv4=$(ip route show scope link | grep -Ev 'wan|utun|iot|peer|docker|podman|virbr|vnet|ovs|vmbr|veth|vmnic|vboxnet|lxcbr|xenbr|vEthernet' | awk '{print $1}') #ipv4局域网网段
+        #ipv4局域网网段
-        [ "$ipv6_redir" = "ON" ] && host_ipv6=$(ip -6 route show default | awk '{print $3}' | tr '\n' ' ' | sed 's/ $//') #ipv6公网地址段
+        host_ipv4=$(ip route show scope link | grep -Ev 'wan|utun|iot|peer|docker|podman|virbr|vnet|ovs|vmbr|veth|vmnic|vboxnet|lxcbr|xenbr|vEthernet' | awk '{print $1}')
+        #ipv6局域网网段
+        [ "$ipv6_redir" = "ON" ] && host_ipv6=$(ip -6 route show | grep -Ev 'default|unreachable|fe80::/|wan|ppp|utun|iot|peer|docker|podman|virbr|vnet|ovs|vmbr|veth|vmnic|vboxnet|lxcbr|xenbr|vEthernet' | awk '{print $1}' | tr '\n' ' ' | sed 's/ $//')
         [ -f "$TMPDIR"/ShellCrash.log ] && break
         [ -n "$host_ipv4" -a "$ipv6_redir" != "ON" ] && break
         [ -n "$host_ipv4" -a -n "$host_ipv6" ] && break

scripts/starts/snapshot_init.sh

@@ -16,7 +16,7 @@ done
 
 autoSSH() {
     #自动开启SSH
-    [ "`uci -c /usr/share/xiaoqiang get xiaoqiang_version.version.CHANNEL`" != 'stable' ] && {
+    [ "$(uci -c /usr/share/xiaoqiang get xiaoqiang_version.version.CHANNEL)" != 'stable' ] && {
         uci -c /usr/share/xiaoqiang set xiaoqiang_version.version.CHANNEL='stable'
         uci -c /usr/share/xiaoqiang commit xiaoqiang_version.version
     }
@@ -28,7 +28,7 @@ autoSSH(){
     #配置nvram
     [ "$(nvram get ssh_en)" = 0 ] && nvram set ssh_en=1
     [ "$(nvram get telnet_en)" = 0 ] && nvram set telnet_en=1
-    nvram commit &> /dev/null
+    nvram commit >/dev/null 2>&1
     #备份还原SSH秘钥
     [ -f "$CRASHDIR"/configs/dropbear_rsa_host_key ] && ln -sf "$CRASHDIR"/configs/dropbear_rsa_host_key /etc/dropbear/dropbear_rsa_host_key
     [ -f "$CRASHDIR"/configs/authorized_keys ] && ln -sf "$CRASHDIR"/configs/authorized_keys /etc/dropbear/authorized_keys
@@ -108,4 +108,3 @@ case "$1" in
         fi
         ;;
 esac
-