@@ -27,6 +27,7 @@ tunn_update() {
27
27
# write open tunnels back into list
28
28
for (( i= 0 ; i < ${# TUNN_LIST[@]} ; i++ )) ; do
29
29
tunn_entry $i
30
+ # shellcheck disable=SC2086
30
31
if ssh $TUNN_DEST -S " $TUNN_SOCKETNAME " -O check >& /dev/null; then
31
32
echo " ${TUNN_LIST[$i]} " >> " $TUNN_LISTFILE "
32
33
else
@@ -59,7 +60,7 @@ tunn_entry() {
59
60
# operations
60
61
61
62
tunn_make () {
62
- TUNN_DEST=" $@ "
63
+ TUNN_DEST=" $* "
63
64
if [ -z " $TUNN_DEST " ]; then
64
65
usage 1
65
66
fi
@@ -69,7 +70,8 @@ tunn_make() {
69
70
TUNN_SOCKETNAME=" $TUNN_PREFIX " _" $TUNN_SOCKETNUM "
70
71
71
72
# 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
73
75
TUNN_EXIT=$?
74
76
75
77
# add to list of tunnels
@@ -105,14 +107,15 @@ tunn_kill() {
105
107
106
108
# get this tunnel
107
109
tunn_read
108
- if [ $INDEX -lt ${# TUNN_LIST[@]} ]; then
109
- tunn_entry $INDEX
110
+ if [ " $INDEX " -lt ${# TUNN_LIST[@]} ]; then
111
+ tunn_entry " $INDEX "
110
112
else
111
113
echo " Tunnel index $INDEX not found"
112
114
exit 2
113
115
fi
114
116
115
117
# execute kill command
118
+ # shellcheck disable=SC2086
116
119
ssh $TUNN_DEST -S " $TUNN_SOCKETNAME " -O exit
117
120
tunn_echo " Killed tunnel: ${TUNN_LIST[$INDEX]} "
118
121
@@ -122,21 +125,21 @@ tunn_kill() {
122
125
123
126
# defaults
124
127
TUNN_LISTFILE=~ /.tunnlist
125
- : ${TUNN_CONFIG:= ~/ .tunnconfig}
128
+ : " ${TUNN_CONFIG:= ~/ .tunnconfig} "
126
129
TUNN_SOCKETNAME=" "
127
130
TUNN_DEST=" "
128
- TUNN_INDEX=" "
129
131
TUNN_UNCLEAN=" "
130
132
131
133
# get config defaults
132
134
if [ -e " $TUNN_CONFIG " ]; then
135
+ # shellcheck source=/dev/null
133
136
source " $TUNN_CONFIG "
134
137
fi
135
- : ${TUNN_PREFIX:= ~/ .tsock}
138
+ : " ${TUNN_PREFIX:= ~/ .tsock} "
136
139
UTMP=$( id -u)
137
140
UTMP=${UTMP: 0-3}
138
- : ${TUNN_PORT:= 8${UTMP} }
139
- : ${TUNN_VERBOSE:= false}
141
+ : " ${TUNN_PORT:= 8${UTMP} } "
142
+ : " ${TUNN_VERBOSE:= false} "
140
143
141
144
declare -A TUNN_INVERT
142
145
TUNN_INVERT[true]=false
@@ -171,11 +174,11 @@ usage() {
171
174
$ECHO " -u \t (unclean) do not auto-remove closed tunnels from list"
172
175
$ECHO " -v \t toggle verbosity (default: $TUNN_VERBOSE )"
173
176
$ECHO " -h \t print this message and exit"
174
- exit $1
177
+ exit " $1 "
175
178
}
176
179
177
180
# get operation
178
- TUNN_OP=$1
181
+ TUNN_OP=" $1 "
179
182
shift 1
180
183
181
184
TUNN_OPFN=" "
@@ -202,6 +205,8 @@ while getopts "n:p:uvh" opt; do
202
205
;;
203
206
h) usage 0
204
207
;;
208
+ * ) usage 1
209
+ ;;
205
210
esac
206
211
done
207
212
@@ -211,7 +216,7 @@ if [ ! -e "$TUNN_LISTFILE" ]; then
211
216
fi
212
217
213
218
# get args for operation (if any)
214
- shift $(( $ OPTIND - 1 ))
219
+ shift $(( OPTIND - 1 ))
215
220
216
221
# execute operation
217
222
$TUNN_OPFN " $@ "
0 commit comments