From de716dd92d666e1aea907dd9a30ce7dafee28598 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Mon, 25 Jun 2018 09:15:59 +0200
Subject: [PATCH] Check if script already in network affects before adding it

---
 luci-mod-admin-full/root/etc/uci-defaults/51_macvlan | 9 +++++++--
 mptcp/files/etc/uci-defaults/mptcp-defaults          | 7 ++++++-
 omr-quota/files/etc/uci-defaults/omr-quota           | 9 +++++++--
 omr-tracker/files/etc/uci-defaults/omr-tracker       | 9 +++++++--
 4 files changed, 27 insertions(+), 7 deletions(-)

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 e3fdf5b9a..2551fe4e2 100755
--- a/luci-mod-admin-full/root/etc/uci-defaults/51_macvlan
+++ b/luci-mod-admin-full/root/etc/uci-defaults/51_macvlan
@@ -3,6 +3,11 @@ uci -q batch <<-EOF
     delete ucitrack.@macvlan[-1]
     add ucitrack macvlan
     set ucitrack.@macvlan[-1].init=macvlan
-    add_list ucitrack.@network[-1].affects=macvlan
     commit ucitrack
-EOF
\ No newline at end of file
+EOF
+if [ "$(uci -q get ucitrack.@network[-1].affects | grep macvlan)" = "" ]; then
+	uci -q batch <<-EOF
+	    add_list ucitrack.@network[-1].affects=macvlan
+	    commit ucitrack
+	EOF
+fi
diff --git a/mptcp/files/etc/uci-defaults/mptcp-defaults b/mptcp/files/etc/uci-defaults/mptcp-defaults
index 6872dcdfc..87f939d83 100755
--- a/mptcp/files/etc/uci-defaults/mptcp-defaults
+++ b/mptcp/files/etc/uci-defaults/mptcp-defaults
@@ -39,7 +39,12 @@ uci -q batch <<-EOF
     delete ucitrack.@mptcp[-1]
     add ucitrack mptcp
     set ucitrack.@mptcp[-1].init=mptcp
-    add_list ucitrack.@network[-1].affects=mptcp
     commit ucitrack
 EOF
+if [ "$(uci -q get ucitrack.@network[-1].affects | grep mptcp)" = "" ]; then
+	uci -q batch <<-EOF
+	    add_list ucitrack.@network[-1].affects=mptcp
+	    commit ucitrack
+	EOF
+fi
 exit 0
\ No newline at end of file
diff --git a/omr-quota/files/etc/uci-defaults/omr-quota b/omr-quota/files/etc/uci-defaults/omr-quota
index 0f09b4695..b9ef06a1d 100755
--- a/omr-quota/files/etc/uci-defaults/omr-quota
+++ b/omr-quota/files/etc/uci-defaults/omr-quota
@@ -3,6 +3,11 @@ uci -q batch <<-EOF
     delete ucitrack.@omr-quota[-1]
     add ucitrack omr-quota
     set ucitrack.@omr-quota[-1].init="omr-quota"
-    add_list ucitrack.@network[-1].affects="omr-quota"
     commit ucitrack
-EOF
\ No newline at end of file
+EOF
+if [ "$(uci -q get ucitrack.@network[-1].affects | grep omr-quota)" = "" ]; then
+	uci -q batch <<-EOF
+	    add_list ucitrack.@network[-1].affects="omr-quota"
+	    commit ucitrack
+	EOF
+fi
diff --git a/omr-tracker/files/etc/uci-defaults/omr-tracker b/omr-tracker/files/etc/uci-defaults/omr-tracker
index e8d5e9fd3..065fb6b53 100755
--- a/omr-tracker/files/etc/uci-defaults/omr-tracker
+++ b/omr-tracker/files/etc/uci-defaults/omr-tracker
@@ -3,6 +3,11 @@ uci -q batch <<-EOF
     delete ucitrack.@omr-tracker[-1]
     add ucitrack omr-tracker
     set ucitrack.@omr-tracker[-1].init="omr-tracker"
-    add_list ucitrack.@network[-1].affects="omr-tracker"
     commit ucitrack
-EOF
\ No newline at end of file
+EOF
+if [ "$(uci -q ucitrack.@network[-1].affects | grep omr-tracker)" = "" ]; then
+	uci -q batch <<-EOF
+	    add_list ucitrack.@network[-1].affects="omr-tracker"
+	    commit ucitrack
+	EOF
+fi
\ No newline at end of file