From 7b8c43a449491af681ed2afee2283e9e1dc5286b Mon Sep 17 00:00:00 2001 From: Ycarus Date: Thu, 18 Apr 2019 09:11:57 +0200 Subject: [PATCH] Less output for uci defaults --- .../root/etc/uci-defaults/openmptcprouter | 20 +++++++++---------- .../root/etc/uci-defaults/51_macvlan | 4 ++-- mptcp/files/etc/uci-defaults/mptcp-defaults | 20 +++++++++---------- omr-6in4/files/etc/uci-defaults/9010-omr-6in4 | 8 ++++---- omr-quota/files/etc/uci-defaults/omr-quota | 4 ++-- .../files/etc/uci-defaults/omr-tracker | 10 +++++----- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter index 39e50d511..41a3a2d37 100755 --- a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter @@ -6,7 +6,7 @@ uci -q batch <<-EOF commit ucitrack EOF if [ "$(uci -q get qos.serverin)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set qos.serverin=classify set qos.serverin.target='Priority' set qos.serverout=classify @@ -15,52 +15,52 @@ if [ "$(uci -q get qos.serverin)" = "" ]; then EOF fi if [ "$(uci -q get qos.serverin.target)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set qos.serverin.target='Priority' set qos.serverout.target='Priority' commit qos EOF fi -if [ "$(uci -q ucitrack.@network[-1].affects | grep openmptcprouter)" = "" ]; then - uci -q batch <<-EOF +if [ "$(uci -q get ucitrack.@network[-1].affects | grep openmptcprouter)" = "" ]; then + uci -q batch <<-EOF >/dev/null add_list ucitrack.@network[-1].affects="openmptcprouter" commit ucitrack EOF fi if [ "$(uci -q get openmptcprouter.vps)" != "server" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set openmptcprouter.vps=server commit openmptcprouter EOF fi if [ "$(uci -q get openmptcprouter.vps.master)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set openmptcprouter.vps.master=1 set openmptcprouter.vps.backup=0 commit openmptcprouter EOF fi if [ "$(uci -q get openmptcprouter.omr)" != "router" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set openmptcprouter.omr=router commit openmptcprouter EOF fi if [ "$(uci -q get openmptcprouter.settings.master)" = "dynamic" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set openmptcprouter.settings=settings set openmptcprouter.settings.master='change' commit openmptcprouter EOF fi if [ "$(uci -q get openmptcprouter.vps.port)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set openmptcprouter.vps.port='65500' commit openmptcprouter EOF fi if [ "$(uci -q get openmptcprouter.settings.disable_ipv6)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set openmptcprouter.settings.disable_ipv6='1' commit openmptcprouter EOF diff --git a/luci-mod-admin-full/root/etc/uci-defaults/51_macvlan b/luci-mod-admin-full/root/etc/uci-defaults/51_macvlan index bb4db1142..c1b9c2406 100755 --- a/luci-mod-admin-full/root/etc/uci-defaults/51_macvlan +++ b/luci-mod-admin-full/root/etc/uci-defaults/51_macvlan @@ -1,12 +1,12 @@ #!/bin/sh -uci -q batch <<-EOF +uci -q batch <<-EOF >/dev/null delete ucitrack.@macvlan[-1] add ucitrack macvlan set ucitrack.@macvlan[-1].init=macvlan commit ucitrack EOF if [ "$(uci -q get ucitrack.@network[-1].affects | grep macvlan)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null add_list ucitrack.@network[-1].affects=macvlan commit ucitrack EOF diff --git a/mptcp/files/etc/uci-defaults/mptcp-defaults b/mptcp/files/etc/uci-defaults/mptcp-defaults index 41984e74a..f5c8ce4db 100755 --- a/mptcp/files/etc/uci-defaults/mptcp-defaults +++ b/mptcp/files/etc/uci-defaults/mptcp-defaults @@ -1,6 +1,6 @@ #!/bin/sh if [ "$(uci -q show network.globals | grep mptcp_path_manager)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set network.globals.multipath='enable' set network.globals.mptcp_path_manager='fullmesh' set network.globals.mptcp_scheduler='default' @@ -12,55 +12,55 @@ if [ "$(uci -q show network.globals | grep mptcp_path_manager)" = "" ]; then EOF fi if [ "$(uci -q get network.globals.congestion)" != "bbr" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set network.globals.congestion=bbr commit network EOF fi if [ "$(uci -q get network.globals.mptcp_syn_retries)" != "1" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set network.globals.mptcp_syn_retries=1 commit network EOF fi if [ "$(uci -q get network.globals.mptcp_checksum)" != "0" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set network.globals.mptcp_checksum=0 commit network EOF fi if [ "$(uci -q get network.globals.mptcp_checksum)" = "enable" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set network.globals.mptcp_checksum=1 EOF fi if [ "$(uci -q get network.globals.mptcp_checksum)" = "disable" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set network.globals.mptcp_checksum=0 EOF fi if [ "$(uci -q get network.globals.mptcp_debug)" != "0" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set network.globals.mptcp_debug=0 EOF fi if [ "$(uci -q show network.globals | grep mptcp_fullmesh)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set network.globals.mptcp_fullmesh_num_subflows=1 set network.globals.mptcp_fullmesh_create_on_err=1 set network.globals.mptcp_ndiffports_num_subflows=1 commit network EOF fi -uci -q batch <<-EOF +uci -q batch <<-EOF >/dev/null delete ucitrack.@mptcp[-1] add ucitrack mptcp set ucitrack.@mptcp[-1].init=mptcp commit ucitrack EOF if [ "$(uci -q get ucitrack.@network[-1].affects | grep mptcp)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null add_list ucitrack.@network[-1].affects=mptcp commit ucitrack EOF diff --git a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 index d877d5e11..f2f321c72 100755 --- a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 +++ b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 @@ -3,7 +3,7 @@ . /lib/functions.sh if [ "$(uci -q show network | grep omr6in4)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set network.omr6in4=interface set network.omr6in4.proto=6in4 set network.omr6in4.ip4table=vpn @@ -17,7 +17,7 @@ if [ "$(uci -q show network | grep omr6in4)" = "" ]; then fi if [ "$(uci -q get ucitrack.@network[-1].affects | grep omr6in4)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null add_list ucitrack.@network[-1].affects=omr6in4 commit ucitrack EOF @@ -25,14 +25,14 @@ fi if [ "$(uci -q get network.omr6in4.ip6addr)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set network.omr6in4.ip6addr=fe80::a00:2 commit network EOF fi if [ "$(uci -q get firewall.zone_vpn.network | grep omr6in4)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null add_list firewall.zone_vpn.network=omr6in4 commit firewall EOF diff --git a/omr-quota/files/etc/uci-defaults/omr-quota b/omr-quota/files/etc/uci-defaults/omr-quota index 7b5d4a126..92a7631b2 100755 --- a/omr-quota/files/etc/uci-defaults/omr-quota +++ b/omr-quota/files/etc/uci-defaults/omr-quota @@ -1,12 +1,12 @@ #!/bin/sh -uci -q batch <<-EOF +uci -q batch <<-EOF >/dev/null delete ucitrack.@omr-quota[-1] add ucitrack omr-quota set ucitrack.@omr-quota[-1].init="omr-quota" commit ucitrack EOF if [ "$(uci -q get ucitrack.@network[-1].affects | grep omr-quota)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null add_list ucitrack.@network[-1].affects="omr-quota" commit ucitrack EOF diff --git a/omr-tracker/files/etc/uci-defaults/omr-tracker b/omr-tracker/files/etc/uci-defaults/omr-tracker index c32dfc49e..3ef1818dd 100755 --- a/omr-tracker/files/etc/uci-defaults/omr-tracker +++ b/omr-tracker/files/etc/uci-defaults/omr-tracker @@ -1,30 +1,30 @@ #!/bin/sh -uci -q batch <<-EOF +uci -q batch <<-EOF >/dev/null delete ucitrack.@omr-tracker[-1] add ucitrack omr-tracker set ucitrack.@omr-tracker[-1].init="omr-tracker" commit ucitrack EOF if [ "$(uci -q get ucitrack.@network[-1].affects | grep omr-tracker)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null add_list ucitrack.@network[-1].affects="omr-tracker" commit ucitrack EOF fi if [ "$(uci -q get ucitrack.@shadowsocks-libev[-1].affects | grep omr-tracker)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null add_list ucitrack.@shadowsocks-libev[-1].affects="omr-tracker" commit ucitrack EOF fi if [ "$(uci -q get omr-tracker.defaults.interval_tries)" = "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null set omr-tracker.defaults.interval_tries=1 commit omr-tracker EOF fi if [ "$(uci -q get omr-tracker.shadowsocks.hosts | grep '23.96.52.53')" != "" ]; then - uci -q batch <<-EOF + uci -q batch <<-EOF >/dev/null del_list omr-tracker.shadowsocks.hosts='23.96.52.53' del_list omr-tracker.shadowsocks.hosts='104.40.211.35' del_list omr-tracker.shadowsocks.hosts='80.67.169.12'