From bceeb02ad89f938d6d492a69141bf7592a0942d1 Mon Sep 17 00:00:00 2001 From: sbwml Date: Mon, 25 Jul 2022 14:11:51 +0800 Subject: [PATCH] luci-app-mosdns: remove bash package dependencies --- luci-app-mosdns/Makefile | 2 +- luci-app-mosdns/root/usr/share/mosdns/ad_domain.sh | 2 +- luci-app-mosdns/root/usr/share/mosdns/dns.sh | 4 ++-- luci-app-mosdns/root/usr/share/mosdns/library.sh | 2 +- luci-app-mosdns/root/usr/share/mosdns/log_path.sh | 2 +- luci-app-mosdns/root/usr/share/mosdns/update_geodat.sh | 3 +-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/luci-app-mosdns/Makefile b/luci-app-mosdns/Makefile index 2ed5fe3..10856fb 100644 --- a/luci-app-mosdns/Makefile +++ b/luci-app-mosdns/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 LUCI_TITLE:=LuCI Support for mosdns LUCI_PKGARCH:=all -LUCI_DEPENDS:=+mosdns +jsonfilter +bash +luci-compat +curl +v2ray-geoip +v2ray-geosite +LUCI_DEPENDS:=+mosdns +jsonfilter +luci-compat +curl +v2ray-geoip +v2ray-geosite define Package/$(PKG_NAME)/conffiles /etc/config/mosdns diff --git a/luci-app-mosdns/root/usr/share/mosdns/ad_domain.sh b/luci-app-mosdns/root/usr/share/mosdns/ad_domain.sh index dadbf80..9a65101 100755 --- a/luci-app-mosdns/root/usr/share/mosdns/ad_domain.sh +++ b/luci-app-mosdns/root/usr/share/mosdns/ad_domain.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh adblock=$(uci -q get mosdns.mosdns.adblock) if [ "$adblock" -eq 1 ];then diff --git a/luci-app-mosdns/root/usr/share/mosdns/dns.sh b/luci-app-mosdns/root/usr/share/mosdns/dns.sh index bfa885d..d28c66d 100755 --- a/luci-app-mosdns/root/usr/share/mosdns/dns.sh +++ b/luci-app-mosdns/root/usr/share/mosdns/dns.sh @@ -1,5 +1,5 @@ -#!/bin/bash -e -# shellcheck source=/etc/mosdns/library.sh +#!/bin/sh + source /usr/share/mosdns/library.sh if [ "$(ifconfig | grep -c wan)" = 0 ]; then diff --git a/luci-app-mosdns/root/usr/share/mosdns/library.sh b/luci-app-mosdns/root/usr/share/mosdns/library.sh index ff967c9..847ed56 100755 --- a/luci-app-mosdns/root/usr/share/mosdns/library.sh +++ b/luci-app-mosdns/root/usr/share/mosdns/library.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh bakdns() { if [ "$1" == "0" ]; then diff --git a/luci-app-mosdns/root/usr/share/mosdns/log_path.sh b/luci-app-mosdns/root/usr/share/mosdns/log_path.sh index 93dca38..db3298c 100755 --- a/luci-app-mosdns/root/usr/share/mosdns/log_path.sh +++ b/luci-app-mosdns/root/usr/share/mosdns/log_path.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/sh configfile=$(uci -q get mosdns.mosdns.configfile) if [ "$configfile" = "/etc/mosdns/config.yaml" ]; then diff --git a/luci-app-mosdns/root/usr/share/mosdns/update_geodat.sh b/luci-app-mosdns/root/usr/share/mosdns/update_geodat.sh index 9a9911e..3359c1d 100755 --- a/luci-app-mosdns/root/usr/share/mosdns/update_geodat.sh +++ b/luci-app-mosdns/root/usr/share/mosdns/update_geodat.sh @@ -1,5 +1,4 @@ -#!/bin/bash -e -# shellcheck source=/etc/mosdns/library.sh +#!/bin/sh set -o pipefail source /usr/share/mosdns/library.sh