From: Samuli Seppänen Date: Tue, 8 Nov 2016 14:06:03 +0000 (+0200) Subject: Prevent generation of duplicate EXPECT_IFCONFIG entries X-Git-Tag: v2.4_beta1~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82a601f1e23d1c37bc2120dca12cadc4dbf2b4fc;p=thirdparty%2Fopenvpn.git Prevent generation of duplicate EXPECT_IFCONFIG entries Previously, if t_client.rc did not source t_client_ips.rc, update_t_client_ips.sh would add (the same) EXPECT_IFCONFIG entries to t_client_ips.rc on every run. This patch makes update_t_client_ips.sh check if the entry exists before trying to add it. v2: prevent partial matches of the EXCEPT_IFCONFIG variable name Signed-off-by: Samuli Seppänen Acked-by: Gert Doering Message-Id: <1478613963-28077-1-git-send-email-samuli@openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg12965.html Signed-off-by: Gert Doering --- diff --git a/tests/update_t_client_ips.sh b/tests/update_t_client_ips.sh index e7b58ba2a..96e382607 100755 --- a/tests/update_t_client_ips.sh +++ b/tests/update_t_client_ips.sh @@ -3,5 +3,14 @@ # This --up script caches the IPs handed out by the test VPN server to a file # for later use. -echo "EXPECT_IFCONFIG4_$TESTNUM=$ifconfig_local" >> $TOP_BUILDDIR/t_client_ips.rc -echo "EXPECT_IFCONFIG6_$TESTNUM=$ifconfig_ipv6_local" >> $TOP_BUILDDIR/t_client_ips.rc +RC="$TOP_BUILDDIR/t_client_ips.rc" + +grep EXPECT_IFCONFIG4_$TESTNUM= $RC > /dev/null 2>&1 +if [ $? -ne 0 ]; then + echo "EXPECT_IFCONFIG4_$TESTNUM=$ifconfig_local" >> $RC +fi + +grep EXPECT_IFCONFIG6_$TESTNUM= $RC > /dev/null 2>&1 +if [ $? -ne 0 ]; then + echo "EXPECT_IFCONFIG6_$TESTNUM=$ifconfig_ipv6_local" >> $RC +fi