Remove repeated suppression. Fix indentation.

test/lint/lint-shell.sh

@@ -13,7 +13,7 @@ export LC_ALL=C
 # respectively. So export LC_ALL=C is set as required by lint-shell-locale.sh
 # but unset here in case of running in Travis.
 if [ "$TRAVIS" = "true" ]; then
-  unset LC_ALL
+    unset LC_ALL
 fi
 
 if ! command -v shellcheck > /dev/null; then
@@ -38,8 +38,7 @@ disabled=(
     SC2116 # Useless echo? Instead of 'cmd $(echo foo)', just use 'cmd foo'.
     SC2148 # Tips depend on target shell and yours is unknown. Add a shebang.
     SC2162 # read without -r will mangle backslashes.
-    SC2166 # Prefer [ p ] && [ q ] as [ p -a q ] is not well defined.
+    SC2166 # Prefer [ p ] {&&,||} [ q ] as [ p -{a,o} q ] is not well defined.
-    SC2166 # Prefer [ p ] || [ q ] as [ p -o q ] is not well defined.
     SC2181 # Check exit code directly with e.g. 'if mycmd;', not indirectly with $?.
     SC2206 # Quote to prevent word splitting, or split robustly with mapfile or read -a.
     SC2207 # Prefer mapfile or read -a to split command output (or quote to avoid splitting).