https://www.shellcheck.net/
Signed-off-by: Tim <elatllat@gmail.com>
| ... | ... |
@@ -16,7 +16,7 @@ possibleConfigs=( |
| 16 | 16 |
if [ $# -gt 0 ]; then |
| 17 | 17 |
CONFIG="$1" |
| 18 | 18 |
else |
| 19 |
- : ${CONFIG:="${possibleConfigs[0]}"}
|
|
| 19 |
+ : "${CONFIG:="${possibleConfigs[0]}"}"
|
|
| 20 | 20 |
fi |
| 21 | 21 |
|
| 22 | 22 |
if ! command -v zgrep &> /dev/null; then |
| ... | ... |
@@ -156,13 +156,13 @@ echo 'Generally Necessary:' |
| 156 | 156 |
echo -n '- ' |
| 157 | 157 |
cgroupSubsystemDir="$(awk '/[, ](cpu|cpuacct|cpuset|devices|freezer|memory)[, ]/ && $3 == "cgroup" { print $2 }' /proc/mounts | head -n1)"
|
| 158 | 158 |
cgroupDir="$(dirname "$cgroupSubsystemDir")" |
| 159 |
-if [ -d "$cgroupDir/cpu" -o -d "$cgroupDir/cpuacct" -o -d "$cgroupDir/cpuset" -o -d "$cgroupDir/devices" -o -d "$cgroupDir/freezer" -o -d "$cgroupDir/memory" ]; then |
|
| 159 |
+if [ -d "$cgroupDir/cpu" ] || [ -d "$cgroupDir/cpuacct" ] || [ -d "$cgroupDir/cpuset" ] || [ -d "$cgroupDir/devices" ] || [ -d "$cgroupDir/freezer" ] || [ -d "$cgroupDir/memory" ]; then |
|
| 160 | 160 |
echo "$(wrap_good 'cgroup hierarchy' 'properly mounted') [$cgroupDir]" |
| 161 | 161 |
else |
| 162 | 162 |
if [ "$cgroupSubsystemDir" ]; then |
| 163 | 163 |
echo "$(wrap_bad 'cgroup hierarchy' 'single mountpoint!') [$cgroupSubsystemDir]" |
| 164 | 164 |
else |
| 165 |
- echo "$(wrap_bad 'cgroup hierarchy' 'nonexistent??')" |
|
| 165 |
+ wrap_bad 'cgroup hierarchy' 'nonexistent??' |
|
| 166 | 166 |
fi |
| 167 | 167 |
EXITCODE=1 |
| 168 | 168 |
echo " $(wrap_color '(see https://github.com/tianon/cgroupfs-mount)' yellow)" |
| ... | ... |
@@ -171,16 +171,16 @@ fi |
| 171 | 171 |
if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = 'Y' ]; then |
| 172 | 172 |
echo -n '- ' |
| 173 | 173 |
if command -v apparmor_parser &> /dev/null; then |
| 174 |
- echo "$(wrap_good 'apparmor' 'enabled and tools installed')" |
|
| 174 |
+ wrap_good 'apparmor' 'enabled and tools installed' |
|
| 175 | 175 |
else |
| 176 |
- echo "$(wrap_bad 'apparmor' 'enabled, but apparmor_parser missing')" |
|
| 176 |
+ wrap_bad 'apparmor' 'enabled, but apparmor_parser missing' |
|
| 177 | 177 |
echo -n ' ' |
| 178 | 178 |
if command -v apt-get &> /dev/null; then |
| 179 |
- echo "$(wrap_color '(use "apt-get install apparmor" to fix this)')" |
|
| 179 |
+ wrap_color '(use "apt-get install apparmor" to fix this)' |
|
| 180 | 180 |
elif command -v yum &> /dev/null; then |
| 181 |
- echo "$(wrap_color '(your best bet is "yum install apparmor-parser")')" |
|
| 181 |
+ wrap_color '(your best bet is "yum install apparmor-parser")' |
|
| 182 | 182 |
else |
| 183 |
- echo "$(wrap_color '(look for an "apparmor" package for your distribution)')" |
|
| 183 |
+ wrap_color '(look for an "apparmor" package for your distribution)' |
|
| 184 | 184 |
fi |
| 185 | 185 |
EXITCODE=1 |
| 186 | 186 |
fi |
| ... | ... |
@@ -199,7 +199,7 @@ flags=( |
| 199 | 199 |
POSIX_MQUEUE |
| 200 | 200 |
) |
| 201 | 201 |
check_flags "${flags[@]}"
|
| 202 |
-if [ "$kernelMajor" -lt 4 ] || [ "$kernelMajor" -eq 4 -a "$kernelMinor" -lt 8 ]; then |
|
| 202 |
+if [ "$kernelMajor" -lt 4 ] || ( [ "$kernelMajor" -eq 4 ] && [ "$kernelMinor" -lt 8 ] ); then |
|
| 203 | 203 |
check_flags DEVPTS_MULTIPLE_INSTANCES |
| 204 | 204 |
fi |
| 205 | 205 |
|
| ... | ... |
@@ -245,15 +245,15 @@ echo 'Optional Features:' |
| 245 | 245 |
fi |
| 246 | 246 |
} |
| 247 | 247 |
|
| 248 |
-if [ "$kernelMajor" -lt 4 ] || [ "$kernelMajor" -eq 4 -a "$kernelMinor" -le 5 ]; then |
|
| 248 |
+if [ "$kernelMajor" -lt 4 ] || ( [ "$kernelMajor" -eq 4 ] && [ "$kernelMinor" -le 5 ] ); then |
|
| 249 | 249 |
check_flags MEMCG_KMEM |
| 250 | 250 |
fi |
| 251 | 251 |
|
| 252 |
-if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 18 ]; then |
|
| 252 |
+if [ "$kernelMajor" -lt 3 ] || ( [ "$kernelMajor" -eq 3 ] && [ "$kernelMinor" -le 18 ] ); then |
|
| 253 | 253 |
check_flags RESOURCE_COUNTERS |
| 254 | 254 |
fi |
| 255 | 255 |
|
| 256 |
-if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 13 ]; then |
|
| 256 |
+if [ "$kernelMajor" -lt 3 ] || ( [ "$kernelMajor" -eq 3 ] && [ "$kernelMinor" -le 13 ] ); then |
|
| 257 | 257 |
netprio=NETPRIO_CGROUP |
| 258 | 258 |
else |
| 259 | 259 |
netprio=CGROUP_NET_PRIO |
| ... | ... |
@@ -291,16 +291,16 @@ if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; |
| 291 | 291 |
fi |
| 292 | 292 |
|
| 293 | 293 |
echo '- Network Drivers:' |
| 294 |
-echo ' - "'$(wrap_color 'overlay' blue)'":' |
|
| 294 |
+echo " - \"$(wrap_color 'overlay' blue)\":" |
|
| 295 | 295 |
check_flags VXLAN | sed 's/^/ /' |
| 296 | 296 |
echo ' Optional (for encrypted networks):' |
| 297 | 297 |
check_flags CRYPTO CRYPTO_AEAD CRYPTO_GCM CRYPTO_SEQIV CRYPTO_GHASH \ |
| 298 | 298 |
XFRM XFRM_USER XFRM_ALGO INET_ESP INET_XFRM_MODE_TRANSPORT | sed 's/^/ /' |
| 299 |
-echo ' - "'$(wrap_color 'ipvlan' blue)'":' |
|
| 299 |
+echo " - \"$(wrap_color 'ipvlan' blue)\":" |
|
| 300 | 300 |
check_flags IPVLAN | sed 's/^/ /' |
| 301 |
-echo ' - "'$(wrap_color 'macvlan' blue)'":' |
|
| 301 |
+echo " - \"$(wrap_color 'macvlan' blue)\":" |
|
| 302 | 302 |
check_flags MACVLAN DUMMY | sed 's/^/ /' |
| 303 |
-echo ' - "'$(wrap_color 'ftp,tftp client in container' blue)'":' |
|
| 303 |
+echo " - \"$(wrap_color 'ftp,tftp client in container' blue)\":" |
|
| 304 | 304 |
check_flags NF_NAT_FTP NF_CONNTRACK_FTP NF_NAT_TFTP NF_CONNTRACK_TFTP | sed 's/^/ /' |
| 305 | 305 |
|
| 306 | 306 |
# only fail if no storage drivers available |
| ... | ... |
@@ -309,7 +309,7 @@ EXITCODE=0 |
| 309 | 309 |
STORAGE=1 |
| 310 | 310 |
|
| 311 | 311 |
echo '- Storage Drivers:' |
| 312 |
-echo ' - "'$(wrap_color 'aufs' blue)'":' |
|
| 312 |
+echo " - \"$(wrap_color 'aufs' blue)\":" |
|
| 313 | 313 |
check_flags AUFS_FS | sed 's/^/ /' |
| 314 | 314 |
if ! is_set AUFS_FS && grep -q aufs /proc/filesystems; then |
| 315 | 315 |
echo " $(wrap_color '(note that some kernels include AUFS patches but not the AUFS_FS flag)' bold black)" |
| ... | ... |
@@ -317,23 +317,23 @@ fi |
| 317 | 317 |
[ "$EXITCODE" = 0 ] && STORAGE=0 |
| 318 | 318 |
EXITCODE=0 |
| 319 | 319 |
|
| 320 |
-echo ' - "'$(wrap_color 'btrfs' blue)'":' |
|
| 320 |
+echo " - \"$(wrap_color 'btrfs' blue)\":" |
|
| 321 | 321 |
check_flags BTRFS_FS | sed 's/^/ /' |
| 322 | 322 |
check_flags BTRFS_FS_POSIX_ACL | sed 's/^/ /' |
| 323 | 323 |
[ "$EXITCODE" = 0 ] && STORAGE=0 |
| 324 | 324 |
EXITCODE=0 |
| 325 | 325 |
|
| 326 |
-echo ' - "'$(wrap_color 'devicemapper' blue)'":' |
|
| 326 |
+echo " - \"$(wrap_color 'devicemapper' blue)\":" |
|
| 327 | 327 |
check_flags BLK_DEV_DM DM_THIN_PROVISIONING | sed 's/^/ /' |
| 328 | 328 |
[ "$EXITCODE" = 0 ] && STORAGE=0 |
| 329 | 329 |
EXITCODE=0 |
| 330 | 330 |
|
| 331 |
-echo ' - "'$(wrap_color 'overlay' blue)'":' |
|
| 331 |
+echo " - \"$(wrap_color 'overlay' blue)\":" |
|
| 332 | 332 |
check_flags OVERLAY_FS | sed 's/^/ /' |
| 333 | 333 |
[ "$EXITCODE" = 0 ] && STORAGE=0 |
| 334 | 334 |
EXITCODE=0 |
| 335 | 335 |
|
| 336 |
-echo ' - "'$(wrap_color 'zfs' blue)'":' |
|
| 336 |
+echo " - \"$(wrap_color 'zfs' blue)\":" |
|
| 337 | 337 |
echo -n " - "; check_device /dev/zfs |
| 338 | 338 |
echo -n " - "; check_command zfs |
| 339 | 339 |
echo -n " - "; check_command zpool |
| ... | ... |
@@ -347,12 +347,12 @@ echo |
| 347 | 347 |
|
| 348 | 348 |
check_limit_over() |
| 349 | 349 |
{
|
| 350 |
- if [ $(cat "$1") -le "$2" ]; then |
|
| 351 |
- wrap_bad "- $1" "$(cat $1)" |
|
| 350 |
+ if [ "$(cat "$1")" -le "$2" ]; then |
|
| 351 |
+ wrap_bad "- $1" "$(cat "$1")" |
|
| 352 | 352 |
wrap_color " This should be set to at least $2, for example set: sysctl -w kernel/keys/root_maxkeys=1000000" bold black |
| 353 | 353 |
EXITCODE=1 |
| 354 | 354 |
else |
| 355 |
- wrap_good "- $1" "$(cat $1)" |
|
| 355 |
+ wrap_good "- $1" "$(cat "$1")" |
|
| 356 | 356 |
fi |
| 357 | 357 |
} |
| 358 | 358 |
|