summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2012-03-27 17:22:39 +0200
committerJouke Witteveen <j.witteveen@gmail.com>2012-03-27 17:22:39 +0200
commit7baf52dfc5e0e70cc8566d693d010465535b1886 (patch)
tree4a5993ae732c78a3938b0629916c38ea440a24e9
parent2a7aa9d913dfa2591592bf1b1e0e6a7cf8e63808 (diff)
downloadnetctl-7baf52dfc5e0e70cc8566d693d010465535b1886.tar.gz
netctl-7baf52dfc5e0e70cc8566d693d010465535b1886.tar.xz
Uniformize SUBR_DIR quoting
It needs to be quoted when used as an argument. Putting the name in curly braces is unnecessary.
-rwxr-xr-xscripts/netcfg-wpa_actiond4
-rwxr-xr-xscripts/wifi-menu2
-rw-r--r--src-wireless/netcfg-auto-wireless4
-rw-r--r--src/connections/wireless4
-rw-r--r--src/globals4
5 files changed, 9 insertions, 9 deletions
diff --git a/scripts/netcfg-wpa_actiond b/scripts/netcfg-wpa_actiond
index 43f7183..48bf48a 100755
--- a/scripts/netcfg-wpa_actiond
+++ b/scripts/netcfg-wpa_actiond
@@ -1,7 +1,7 @@
#! /bin/bash
. /usr/lib/network/network
-. $SUBR_DIR/8021x
-. $SUBR_DIR/rfkill
+. "$SUBR_DIR/8021x"
+. "$SUBR_DIR/rfkill"
. /etc/rc.conf
. /etc/conf.d/netcfg
diff --git a/scripts/wifi-menu b/scripts/wifi-menu
index 25ac87e..75bfede 100755
--- a/scripts/wifi-menu
+++ b/scripts/wifi-menu
@@ -1,7 +1,7 @@
#! /bin/bash
. /usr/lib/network/network
-. $SUBR_DIR/8021x
+. "$SUBR_DIR/8021x"
. /etc/conf.d/netcfg
# The right value depends on the connected profile.
diff --git a/src-wireless/netcfg-auto-wireless b/src-wireless/netcfg-auto-wireless
index 4d0a5e1..e541155 100644
--- a/src-wireless/netcfg-auto-wireless
+++ b/src-wireless/netcfg-auto-wireless
@@ -2,8 +2,8 @@
# Originally contributed by Neuro: http://bbs.archlinux.org/viewtopic.php?pid=278148#p278148
. /usr/lib/network/network
-. $SUBR_DIR/rfkill
-. $SUBR_DIR/8021x
+. "$SUBR_DIR/rfkill"
+. "$SUBR_DIR/8021x"
. /etc/conf.d/netcfg
# wifi_auto
diff --git a/src/connections/wireless b/src/connections/wireless
index 2e371c9..7abb180 100644
--- a/src/connections/wireless
+++ b/src/connections/wireless
@@ -1,7 +1,7 @@
#! /bin/bash
. /usr/lib/network/network
-. $SUBR_DIR/8021x
-. $SUBR_DIR/rfkill
+. "$SUBR_DIR/8021x"
+. "$SUBR_DIR/rfkill"
wireless_up() {
diff --git a/src/globals b/src/globals
index cb5b50a..082e782 100644
--- a/src/globals
+++ b/src/globals
@@ -12,8 +12,8 @@
PROFILE_DIR="/etc/network.d"
IFACE_DIR="$PROFILE_DIR/interfaces"
SUBR_DIR="/usr/lib/network"
-HOOKS_DIR="${SUBR_DIR}/hooks"
-CONN_DIR="${SUBR_DIR}/connections"
+HOOKS_DIR="$SUBR_DIR/hooks"
+CONN_DIR="$SUBR_DIR/connections"
STATE_DIR="/run/network"