diff options
| author | Jouke Witteveen <j.witteveen@gmail.com> | 2012-10-12 15:09:08 +0200 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2012-10-12 15:09:08 +0200 |
| commit | ba2128f0233c04aea1f5adc425938f78bdd7540e (patch) | |
| tree | b7c8828b736f02fd4c3c2a07ddd58902cd264d7e | |
| parent | e06f4c789a2f53401f22d39ed1180967adbb6271 (diff) | |
| download | netctl-ba2128f0233c04aea1f5adc425938f78bdd7540e.tar.gz netctl-ba2128f0233c04aea1f5adc425938f78bdd7540e.tar.xz | |
Fix whitespace and quoting
| -rwxr-xr-x | contrib/pm-utils.handler | 2 | ||||
| -rwxr-xr-x | scripts/netcfg-wpa_actiond | 8 | ||||
| -rw-r--r-- | src/connections/ethernet | 6 | ||||
| -rw-r--r-- | src/connections/openvpn | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/contrib/pm-utils.handler b/contrib/pm-utils.handler index 3db87a0..378d32d 100755 --- a/contrib/pm-utils.handler +++ b/contrib/pm-utils.handler @@ -30,7 +30,7 @@ case "$1" in hibernate|suspend_hybrid|suspend) report_notice "suspending all interfaces..." daemon_suspend_all - if checkyesno "${RESTOREPROFILES:-no}"; then + if checkyesno "${RESTOREPROFILES:-no}"; then interface_suspend all fi ;; diff --git a/scripts/netcfg-wpa_actiond b/scripts/netcfg-wpa_actiond index 3a6ec22..9e2264b 100755 --- a/scripts/netcfg-wpa_actiond +++ b/scripts/netcfg-wpa_actiond @@ -49,7 +49,7 @@ if [[ -n "$RFKILL" ]]; then # Enable radio if necessary enable_rf "$interface" "$RFKILL" "$RFKILL_NAME" || exit $? fi -WPA_CONF="$(make_wpa_config_file $interface)" +WPA_CONF="$(make_wpa_config_file "$interface")" if [[ -n "${AUTO_PROFILES}" ]]; then # At some point, this can be removed. @@ -72,7 +72,7 @@ fi | while read profile; do [[ -z "$SECURITY" ]] && SECURITY="none" [[ $SECURITY == "wpa-config" ]] && exit 1 - printf "%s\n" "network={" "$(make_wpa_config)" "id_str=\"$profile\"" "}" >> $WPA_CONF + printf "%s\n" "network={" "$(make_wpa_config)" "id_str=\"$profile\"" "}" >> "$WPA_CONF" ) done @@ -83,8 +83,8 @@ WPA_OPTS="-W $WPA_OPTS" # Kill any existing wpa_supplicant on this interface stop_wpa "$interface" &> /dev/null -if start_wpa $interface $WPA_CONF $WPA_DRIVER $WPA_OPTS; then - if $AUTOWIFI -i ${interface} -P ${PIDFILE} -a ${ACTION_SCRIPT} ${EXTRA_AUTOWIFI_OPTIONS}; then +if start_wpa "$interface" "$WPA_CONF" "$WPA_DRIVER" $WPA_OPTS; then + if $AUTOWIFI -i "$interface" -P "$PIDFILE" -a "$ACTION_SCRIPT" $EXTRA_AUTOWIFI_OPTIONS; then exit 0 fi fi diff --git a/src/connections/ethernet b/src/connections/ethernet index 00079fc..94c04a1 100644 --- a/src/connections/ethernet +++ b/src/connections/ethernet @@ -205,7 +205,7 @@ ethernet_up() { # Set hostname if [[ -n "$HOSTNAME" ]]; then report_debug ethernet_up hostname "$HOSTNAME" - if ! echo "$HOSTNAME" > /proc/sys/kernel/hostname; then + if ! echo "$HOSTNAME" >/proc/sys/kernel/hostname; then report_iproute "Cannot set hostname to $HOSTNAME" fi fi @@ -213,8 +213,8 @@ ethernet_up() { # Generate a new resolv.conf if [[ -n "$DNS" ]]; then : >/etc/resolv.conf - [[ -n "$DOMAIN" ]] && echo "domain $DOMAIN" >>/etc/resolv.conf - [[ -n "$SEARCH" ]] && echo "search $SEARCH" >>/etc/resolv.conf + [[ -n "$DOMAIN" ]] && echo "domain $DOMAIN" >>/etc/resolv.conf + [[ -n "$SEARCH" ]] && echo "search $SEARCH" >>/etc/resolv.conf for dns in "${DNS[@]}"; do echo "nameserver $dns" >>/etc/resolv.conf done diff --git a/src/connections/openvpn b/src/connections/openvpn index cb0adde..27c8c65 100644 --- a/src/connections/openvpn +++ b/src/connections/openvpn @@ -23,8 +23,8 @@ openvpn_up() { if [[ -n "$DNS" ]]; then [[ -e /etc/resolv.conf ]] && cp /etc/resolv.conf /tmp/openvpn-$1-resolv.conf : >/etc/resolv.conf - [[ -n "$DOMAIN" ]] && echo "domain $DOMAIN" >>/etc/resolv.conf - [[ -n "$SEARCH" ]] && echo "search $SEARCH" >>/etc/resolv.conf + [[ -n "$DOMAIN" ]] && echo "domain $DOMAIN" >>/etc/resolv.conf + [[ -n "$SEARCH" ]] && echo "search $SEARCH" >>/etc/resolv.conf for dns in "${DNS[@]}"; do echo "nameserver $dns" >>/etc/resolv.conf done |