update ltt-armall/disarmall

- Protect variables
- use /bin/sh instead of /bin/bash

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

diff --git a/lttctl/ltt-armall.sh b/lttctl/ltt-armall.sh
index 7771505f6d3d494d2cf401191f0060ad3630d1a5..9eda365490dc5052b6cfc65a766dd0f4ff7e55b1 100755 (executable)
--- a/lttctl/ltt-armall.sh
+++ b/lttctl/ltt-armall.sh
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (C) 2009 Benjamin Poirier
 
 # This program is free software; you can redistribute it and/or modify
@@ -31,18 +30,18 @@ usage () {
        echo "" > /dev/stderr
 }
 
-if [ ! "$DEBUGFSROOT" ]; then
+if [ ! "${DEBUGFSROOT}" ]; then
        echo "Error: debugfs not mounted" > /dev/stderr
        exit 1;
 fi
 
-if [ ! -d "$MARKERSROOT" ]; then
+if [ ! -d "${MARKERSROOT}" ]; then
        echo "Error: LTT trace controller not found (did you compile and load LTTng?)" > /dev/stderr
        exit 1;
 fi
 
 while getopts "lnqh" options; do
-       case $options in
+       case ${options} in
                l) LOCKING="0";;
                n) NETWORK="0";;
                q) QUIET="0";;
@@ -52,20 +51,20 @@ while getopts "lnqh" options; do
                        exit 1;;
        esac
 done
-shift $(($OPTIND - 1))
+shift $((${OPTIND} - 1))
 
 
-if [ ! $LOCKING ]; then
+if [ ! ${LOCKING} ]; then
        TESTS="${TESTS} -name lockdep -prune -o -name locking -prune -o"
 fi
 
-if [ ! $NETWORK ]; then
+if [ ! ${NETWORK} ]; then
        TESTS="${TESTS} -path '*/net/*_extended' -prune -o"
 fi
 
 while read -r -d $'\0' marker; do
-       if [ ! $QUIET ]; then
+       if [ ! ${QUIET} ]; then
                echo "Connecting ${marker%/enable}"
        fi
-       echo 1 > $marker
-done < <(eval "find '$MARKERSROOT' $TESTS -name metadata -prune -o -name enable -print0")
+       echo 1 > ${marker}
+done < <(eval "find '${MARKERSROOT}' ${TESTS} -name metadata -prune -o -name enable -print0")

diff --git a/lttctl/ltt-disarmall.sh b/lttctl/ltt-disarmall.sh
index 2b5704f4d6eebb003cc03e1904cb22178a056c5c..aa1a0d7736160e5676435d94b63df662b37421da 100755 (executable)
--- a/lttctl/ltt-disarmall.sh
+++ b/lttctl/ltt-disarmall.sh
@@ -1,4 +1,3 @@
-#!/bin/bash
 # Copyright (C) 2009 Benjamin Poirier
 
 # This program is free software; you can redistribute it and/or modify
@@ -28,18 +27,18 @@ usage () {
        echo "" > /dev/stderr
 }
 
-if [ ! "$DEBUGFSROOT" ]; then
+if [ ! "${DEBUGFSROOT}" ]; then
        echo "Error: debugfs not mounted" > /dev/stderr
        exit 1;
 fi
 
-if [ ! -d "$MARKERSROOT" ]; then
+if [ ! -d "${MARKERSROOT}" ]; then
        echo "Error: LTT trace controller not found (did you compile and load LTTng?)" > /dev/stderr
        exit 1;
 fi
 
 while getopts "qh" options; do
-       case $options in
+       case ${options} in
                q) QUIET="0";;
                h) usage;
                        exit 0;;
@@ -47,15 +46,15 @@ while getopts "qh" options; do
                        exit 1;;
        esac
 done
-shift $(($OPTIND - 1))
+shift $((${OPTIND} - 1))
 
 while read -r -d $'\0' marker; do
-       grep "^1$" "$marker" -q
+       grep "^1$" "${marker}" -q
        if [ $? -ne 0 ]; then
                continue
        fi
-       if [ ! $QUIET ]; then
+       if [ ! ${QUIET} ]; then
                echo "Disconnecting ${marker%/enable}"
        fi
-       echo 0 > $marker
-done < <(eval "find '$MARKERSROOT' -name metadata -prune -o -name enable -print0")
+       echo 0 > ${marker}
+done < <(eval "find '${MARKERSROOT}' -name metadata -prune -o -name enable -print0")