hal: Branch 'hal-0_5_11-branch'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Tue Apr 8 14:30:36 PDT 2008
tools/linux/hal-system-killswitch-get-power-linux | 8 ++++----
tools/linux/hal-system-killswitch-set-power-linux | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 5e2fb734ccc8c36a9a97c65d83fa6abda0e26cb3
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Apr 8 23:28:14 2008 +0200
fixed quoting for DELL_WCTL
Fixed quoting for DELL_WCTL in the killswitch scripts.
diff --git a/tools/linux/hal-system-killswitch-get-power-linux b/tools/linux/hal-system-killswitch-get-power-linux
index 9f2e412..8ed817e 100755
--- a/tools/linux/hal-system-killswitch-get-power-linux
+++ b/tools/linux/hal-system-killswitch-get-power-linux
@@ -9,7 +9,7 @@
# (at your option) any later version.
DELL_WCTL=/usr/bin/dellWirelessCtl
-if [ -x /usr/sbin/dellWirelessCtl ]; then
+if [ -x "/usr/sbin/dellWirelessCtl" ]; then
DELL_WCTL=/usr/sbin/dellWirelessCtl
fi
@@ -22,7 +22,7 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
exit 1
fi
exit ${value}
- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then
+ elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x "$DELL_WCTL" ]; then
# TODO: write our own binary that links with libsmbios?
$DELL_WCTL --st_bt
value=$?
@@ -48,7 +48,7 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
exit 1
fi
elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then
+ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x "$DELL_WCTL" ]; then
# TODO: write our own binary that links with libsmbios?
$DELL_WCTL --st_wlan
value=$?
@@ -77,7 +77,7 @@ elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
exit 1
fi
elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then
+ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x "$DELL_WCTL" ]; then
# TODO: write our own binary that links with libsmbios?
$DELL_WCTL --st_wwan
value=$?
diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux
index a1e7b1a..2f805d8 100755
--- a/tools/linux/hal-system-killswitch-set-power-linux
+++ b/tools/linux/hal-system-killswitch-set-power-linux
@@ -9,7 +9,7 @@
# (at your option) any later version.
DELL_WCTL=/usr/bin/dellWirelessCtl
-if [ -x /usr/sbin/dellWirelessCtl ]; then
+if [ -x "/usr/sbin/dellWirelessCtl" ]; then
DELL_WCTL=/usr/sbin/dellWirelessCtl
fi
@@ -21,7 +21,7 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
exit 1
fi
exit 0
- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then
+ elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x "$DELL_WCTL" ]; then
# As a side effect we disable the physical kill switch
@@ -56,7 +56,7 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then
exit 1
fi
elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then
+ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x "$DELL_WCTL" ]; then
# As a side effect we disable the physical kill switch
@@ -90,7 +90,7 @@ elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then
exit 1
fi
elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then
- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then
+ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x "$DELL_WCTL" ]; then
# As a side effect we disable the physical kill switch
More information about the hal-commit
mailing list