diff options
| -rw-r--r-- | scripts/bluetooth.init | 8 | ||||
| -rwxr-xr-x | test/hsplay | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/bluetooth.init b/scripts/bluetooth.init index 82cd68cf..fad223fd 100644 --- a/scripts/bluetooth.init +++ b/scripts/bluetooth.init @@ -45,7 +45,7 @@ PAND_OPTIONS="" case "$1" in start) echo -n "Starting $DESC:" - if $HCID_ENABLE && [ -x "$HCID_EXEC" -a -f "$HCID_CONFIG" ] ; then + if $HCID_ENABLE && [ -x "$HCID_EXEC" ] && [ -f "$HCID_CONFIG" ] ; then $HCID_EXEC -f $HCID_CONFIG echo -n " $HCID_NAME" fi @@ -61,15 +61,15 @@ case "$1" in $HID2HCI_EXEC --tohci > /dev/null 2>&1 || true echo -n " $HID2HCI_NAME" fi - if $RFCOMM_ENABLE && [ -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ] ; then + if $RFCOMM_ENABLE && [ -x "$RFCOMM_EXEC" ] && [ -f "$RFCOMM_CONFIG" ] ; then $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all || true echo -n " $RFCOMM_NAME" fi - if $DUND_ENABLE && [ -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ] ; then + if $DUND_ENABLE && [ -x "$DUND_EXEC" ] && [ -n "$DUND_OPTIONS" ] ; then $DUND_EXEC $DUND_OPTIONS echo -n " $DUND_NAME" fi - if $PAND_ENABLE && [ -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ] ; then + if $PAND_ENABLE && [ -x "$PAND_EXEC" ] && [ -n "$PAND_OPTIONS" ] ; then $PAND_EXEC $PAND_OPTIONS echo -n " $PAND_NAME" fi diff --git a/test/hsplay b/test/hsplay index 5f53562b..8cecbffa 100755 --- a/test/hsplay +++ b/test/hsplay @@ -9,7 +9,7 @@ then HSTEST="./hstest" fi -if [ -z "$1" -o -z "$2" ] +if [ -z "$1" ] || [ -z "$2" ] then echo -e "Usage:\n\thsplay <file> <bdaddr> [channel]" exit |