添加 .editorconfig 配置,约束 *.sh 文件格式
This commit is contained in:
13
.editorconfig
Normal file
13
.editorconfig
Normal file
@@ -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
|
||||||
|
|
||||||
@@ -14,9 +14,9 @@ while [ ! -f "$CRASHDIR/configs/ShellCrash.cfg" ]; do
|
|||||||
done
|
done
|
||||||
. "$CRASHDIR"/configs/ShellCrash.cfg
|
. "$CRASHDIR"/configs/ShellCrash.cfg
|
||||||
|
|
||||||
autoSSH(){
|
autoSSH() {
|
||||||
#自动开启SSH
|
#自动开启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 set xiaoqiang_version.version.CHANNEL='stable'
|
||||||
uci -c /usr/share/xiaoqiang commit xiaoqiang_version.version
|
uci -c /usr/share/xiaoqiang commit xiaoqiang_version.version
|
||||||
}
|
}
|
||||||
@@ -28,13 +28,13 @@ autoSSH(){
|
|||||||
#配置nvram
|
#配置nvram
|
||||||
[ "$(nvram get ssh_en)" = 0 ] && nvram set ssh_en=1
|
[ "$(nvram get ssh_en)" = 0 ] && nvram set ssh_en=1
|
||||||
[ "$(nvram get telnet_en)" = 0 ] && nvram set telnet_en=1
|
[ "$(nvram get telnet_en)" = 0 ] && nvram set telnet_en=1
|
||||||
nvram commit &> /dev/null
|
nvram commit >/dev/null 2>&1
|
||||||
#备份还原SSH秘钥
|
#备份还原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/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
|
[ -f "$CRASHDIR"/configs/authorized_keys ] && ln -sf "$CRASHDIR"/configs/authorized_keys /etc/dropbear/authorized_keys
|
||||||
}
|
}
|
||||||
tunfix(){
|
tunfix() {
|
||||||
ko_dir=$(modinfo ip_tables | grep -Eo '/lib/modules.*/ip_tables.ko' | sed 's|/ip_tables.ko||' )
|
ko_dir=$(modinfo ip_tables | grep -Eo '/lib/modules.*/ip_tables.ko' | sed 's|/ip_tables.ko||')
|
||||||
#在/tmp创建并挂载overlay
|
#在/tmp创建并挂载overlay
|
||||||
mkdir -p /tmp/overlay
|
mkdir -p /tmp/overlay
|
||||||
mkdir -p /tmp/overlay/upper
|
mkdir -p /tmp/overlay/upper
|
||||||
@@ -43,12 +43,12 @@ tunfix(){
|
|||||||
#将tun.ko链接到lib
|
#将tun.ko链接到lib
|
||||||
ln -sf "$CRASHDIR"/tools/tun.ko "$ko_dir"/tun.ko
|
ln -sf "$CRASHDIR"/tools/tun.ko "$ko_dir"/tun.ko
|
||||||
}
|
}
|
||||||
tproxyfix(){
|
tproxyfix() {
|
||||||
sed -i 's/sysctl -w net.bridge.bridge-nf-call-ip/#sysctl -w net.bridge.bridge-nf-call-ip/g' /etc/init.d/qca-nss-ecm
|
sed -i 's/sysctl -w net.bridge.bridge-nf-call-ip/#sysctl -w net.bridge.bridge-nf-call-ip/g' /etc/init.d/qca-nss-ecm
|
||||||
sysctl -w net.bridge.bridge-nf-call-iptables=0
|
sysctl -w net.bridge.bridge-nf-call-iptables=0
|
||||||
sysctl -w net.bridge.bridge-nf-call-ip6tables=0
|
sysctl -w net.bridge.bridge-nf-call-ip6tables=0
|
||||||
}
|
}
|
||||||
auto_clean(){
|
auto_clean() {
|
||||||
#自动清理升级备份文件夹
|
#自动清理升级备份文件夹
|
||||||
rm -rf /data/etc_bak
|
rm -rf /data/etc_bak
|
||||||
#自动清理被写入闪存的系统日志并禁止服务
|
#自动清理被写入闪存的系统日志并禁止服务
|
||||||
@@ -59,7 +59,7 @@ auto_clean(){
|
|||||||
rm -rf /data/usr/log /data/usr/sec_cfg
|
rm -rf /data/usr/log /data/usr/sec_cfg
|
||||||
|
|
||||||
}
|
}
|
||||||
auto_start(){
|
auto_start() {
|
||||||
#设置init.d服务
|
#设置init.d服务
|
||||||
[ ! -x /etc/init.d/shellcrash ] && {
|
[ ! -x /etc/init.d/shellcrash ] && {
|
||||||
cp -f "$CRASHDIR"/starts/shellcrash.procd /etc/init.d/shellcrash
|
cp -f "$CRASHDIR"/starts/shellcrash.procd /etc/init.d/shellcrash
|
||||||
@@ -83,9 +83,9 @@ auto_start(){
|
|||||||
/etc/init.d/shellcrash start && /etc/init.d/shellcrash enable
|
/etc/init.d/shellcrash start && /etc/init.d/shellcrash enable
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
init(){
|
init() {
|
||||||
#等待启动完成
|
#等待启动完成
|
||||||
while ! ip a| grep -q lan; do
|
while ! ip a | grep -q lan; do
|
||||||
sleep 10
|
sleep 10
|
||||||
done
|
done
|
||||||
autoSSH #软固化功能
|
autoSSH #软固化功能
|
||||||
@@ -103,9 +103,8 @@ case "$1" in
|
|||||||
auto_clean) auto_clean ;;
|
auto_clean) auto_clean ;;
|
||||||
init) init ;;
|
init) init ;;
|
||||||
*)
|
*)
|
||||||
if [ -z "$(pidof CrashCore)" ];then
|
if [ -z "$(pidof CrashCore)" ]; then
|
||||||
init &
|
init &
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user