Skip to content

Commit e3e884f

Browse files
committed
shellcheck fixes
1 parent 02a6ce8 commit e3e884f

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

tunn

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ tunn_update() {
2727
# write open tunnels back into list
2828
for ((i=0; i < ${#TUNN_LIST[@]}; i++)); do
2929
tunn_entry $i
30+
# shellcheck disable=SC2086
3031
if ssh $TUNN_DEST -S "$TUNN_SOCKETNAME" -O check >&/dev/null; then
3132
echo "${TUNN_LIST[$i]}" >> "$TUNN_LISTFILE"
3233
else
@@ -59,7 +60,7 @@ tunn_entry() {
5960
# operations
6061

6162
tunn_make() {
62-
TUNN_DEST="$@"
63+
TUNN_DEST="$*"
6364
if [ -z "$TUNN_DEST" ]; then
6465
usage 1
6566
fi
@@ -69,7 +70,8 @@ tunn_make() {
6970
TUNN_SOCKETNAME="$TUNN_PREFIX"_"$TUNN_SOCKETNUM"
7071

7172
# execute tunnel command
72-
ssh $TUNN_DEST -N -D $TUNN_PORT -f -M -S "$TUNN_SOCKETNAME" 2>/dev/null
73+
# shellcheck disable=SC2086
74+
ssh $TUNN_DEST -N -D "$TUNN_PORT" -f -M -S "$TUNN_SOCKETNAME" 2>/dev/null
7375
TUNN_EXIT=$?
7476

7577
# add to list of tunnels
@@ -105,14 +107,15 @@ tunn_kill() {
105107

106108
# get this tunnel
107109
tunn_read
108-
if [ $INDEX -lt ${#TUNN_LIST[@]} ]; then
109-
tunn_entry $INDEX
110+
if [ "$INDEX" -lt ${#TUNN_LIST[@]} ]; then
111+
tunn_entry "$INDEX"
110112
else
111113
echo "Tunnel index $INDEX not found"
112114
exit 2
113115
fi
114116

115117
# execute kill command
118+
# shellcheck disable=SC2086
116119
ssh $TUNN_DEST -S "$TUNN_SOCKETNAME" -O exit
117120
tunn_echo "Killed tunnel: ${TUNN_LIST[$INDEX]}"
118121

@@ -122,21 +125,21 @@ tunn_kill() {
122125

123126
# defaults
124127
TUNN_LISTFILE=~/.tunnlist
125-
: ${TUNN_CONFIG:=~/.tunnconfig}
128+
: "${TUNN_CONFIG:=~/.tunnconfig}"
126129
TUNN_SOCKETNAME=""
127130
TUNN_DEST=""
128-
TUNN_INDEX=""
129131
TUNN_UNCLEAN=""
130132

131133
# get config defaults
132134
if [ -e "$TUNN_CONFIG" ]; then
135+
# shellcheck source=/dev/null
133136
source "$TUNN_CONFIG"
134137
fi
135-
: ${TUNN_PREFIX:=~/.tsock}
138+
: "${TUNN_PREFIX:=~/.tsock}"
136139
UTMP=$(id -u)
137140
UTMP=${UTMP:0-3}
138-
: ${TUNN_PORT:=8${UTMP}}
139-
: ${TUNN_VERBOSE:=false}
141+
: "${TUNN_PORT:=8${UTMP}}"
142+
: "${TUNN_VERBOSE:=false}"
140143

141144
declare -A TUNN_INVERT
142145
TUNN_INVERT[true]=false
@@ -171,11 +174,11 @@ usage() {
171174
$ECHO "-u \t (unclean) do not auto-remove closed tunnels from list"
172175
$ECHO "-v \t toggle verbosity (default: $TUNN_VERBOSE)"
173176
$ECHO "-h \t print this message and exit"
174-
exit $1
177+
exit "$1"
175178
}
176179

177180
# get operation
178-
TUNN_OP=$1
181+
TUNN_OP="$1"
179182
shift 1
180183

181184
TUNN_OPFN=""
@@ -202,6 +205,8 @@ while getopts "n:p:uvh" opt; do
202205
;;
203206
h) usage 0
204207
;;
208+
*) usage 1
209+
;;
205210
esac
206211
done
207212

@@ -211,7 +216,7 @@ if [ ! -e "$TUNN_LISTFILE" ]; then
211216
fi
212217

213218
# get args for operation (if any)
214-
shift $(($OPTIND - 1))
219+
shift $((OPTIND - 1))
215220

216221
# execute operation
217222
$TUNN_OPFN "$@"

0 commit comments

Comments
 (0)