From 28028b26b3371756811e95d894f709f4b1207c00 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 18 Dec 2019 18:29:24 +0100
Subject: New upstream version 1.22.0

---
 examples/dispatcher/10-ifcfg-rh-routes.sh      | 32 +++++++++++---------------
 examples/dispatcher/70-wifi-wired-exclusive.sh |  4 ++--
 2 files changed, 16 insertions(+), 20 deletions(-)

(limited to 'examples/dispatcher')

diff --git a/examples/dispatcher/10-ifcfg-rh-routes.sh b/examples/dispatcher/10-ifcfg-rh-routes.sh
index d72400ae..0f49ec2a 100755
--- a/examples/dispatcher/10-ifcfg-rh-routes.sh
+++ b/examples/dispatcher/10-ifcfg-rh-routes.sh
@@ -12,6 +12,20 @@
 # This file is derived from scripts 'if{up,down}-routes' from
 # Fedora/RHEL initscripts.
 
+if [ "$2" != "pre-up" ] && [ "$2" != "down" ]; then
+    exit 0
+fi
+
+file_regex='^/etc/sysconfig/network-scripts/ifcfg-([^/]+)$'
+
+[[ "$CONNECTION_FILENAME" =~ $file_regex ]] || exit 0
+
+profile="${BASH_REMATCH[1]}"
+
+if [ ! -f "/etc/sysconfig/network-scripts/rule-$profile" ] && [ ! -f "/etc/sysconfig/network-scripts/rule6-$profile" ]; then
+    exit 0
+fi
+
 MATCH='^[[:space:]]*(\#.*)?$'
 
 handle_file () {
@@ -45,24 +59,6 @@ handle_ip_file() {
 }
 
 
-if [ "$2" != "pre-up" ] && [ "$2" != "down" ]; then
-    exit 0
-fi
-
-dir=$(dirname "$CONNECTION_FILENAME")
-if [ "$dir" != "/etc/sysconfig/network-scripts" ]; then
-    exit 0
-fi
-
-profile=$(basename "$CONNECTION_FILENAME" | sed -ne 's/^ifcfg-//p')
-if [ -z "$profile" ]; then
-    exit 0
-fi
-
-if [ ! -f "$dir/rule-$profile" ] && [ ! -f "$dir/rule6-$profile" ]; then
-    exit 0
-fi
-
 case "$2" in
     pre-up)
         # Routes
diff --git a/examples/dispatcher/70-wifi-wired-exclusive.sh b/examples/dispatcher/70-wifi-wired-exclusive.sh
index fac18b59..b8a2336e 100755
--- a/examples/dispatcher/70-wifi-wired-exclusive.sh
+++ b/examples/dispatcher/70-wifi-wired-exclusive.sh
@@ -4,8 +4,8 @@
 # Wi-Fi will be set to airplane mode (rfkilled).  When the wired
 # interface is disconnected, Wi-Fi will be turned back on.
 #
-# Copyright 2012 Johannes Buchner <buchner.johannes@gmx.at>
-# Copyright 2012 - 2014 Red Hat, Inc.
+# Copyright (C) 2012 Johannes Buchner <buchner.johannes@gmx.at>
+# Copyright (C) 2012 - 2014 Red Hat, Inc.
 #
 
 export LC_ALL=C
-- 
cgit 1.3.0-6-gf8a5