Browse code
Cleanup setup script
Ed Langley authored on 16/06/2017 22:15:42
Showing 1 changed files
Showing 1 changed files
... | ... |
@@ -1,6 +1,7 @@ |
1 | 1 |
#!/usr/bin/env bash |
2 |
+set -e -u -o pipefail |
|
2 | 3 |
|
3 |
-DUAL_CONTROL="$(which dual_control)" |
|
4 |
+DUAL_CONTROL="$(command -v dual_control || printf '')" |
|
4 | 5 |
DUAL_CONTROL="${DUAL_CONTROL:-./dual_control}" |
5 | 6 |
|
6 | 7 |
get_key() { |
... | ... |
@@ -14,7 +15,7 @@ get_token() { |
14 | 15 |
qr() { |
15 | 16 |
local VAL=$1 |
16 | 17 |
local MODE=${2:-ANSI} |
17 |
- shift 2 |
|
18 |
+ shift 2 || true |
|
18 | 19 |
|
19 | 20 |
qrencode -t $MODE $VAL |
20 | 21 |
} |
... | ... |
@@ -30,7 +31,7 @@ main() { |
30 | 31 |
local KEY_URL="$(get_url "$KEY")" |
31 | 32 |
local NONINTERACTIVE="$1" |
32 | 33 |
|
33 |
- if which qrencode > /dev/null; then |
|
34 |
+ if command -v qrencode > /dev/null; then |
|
34 | 35 |
qr $KEY_URL |
35 | 36 |
else |
36 | 37 |
echo "Run 'yum install qrencode' to get a QR code" |
... | ... |
@@ -51,8 +52,8 @@ main() { |
51 | 52 |
popd > /dev/null |
52 | 53 |
} |
53 | 54 |
|
54 |
-case "$1" in |
|
55 |
- '-h') |
|
55 |
+case "${1:-}" in |
|
56 |
+'-h') |
|
56 | 57 |
cat <<EOF |
57 | 58 |
USAGE: |
58 | 59 |
$(basename $0) [--help] |
... | ... |
@@ -60,6 +61,7 @@ USAGE: |
60 | 61 |
EOF |
61 | 62 |
exit 0 |
62 | 63 |
;; |
64 |
+ |
|
63 | 65 |
*) |
64 |
- main "$1" |
|
66 |
+ main "${1:-}" |
|
65 | 67 |
esac |