refactor: improve comments; use ||/&& instead of one branch/one line if 🎰

Author: oldratlee

bin/a2l

@@ -60,12 +60,12 @@ while [ $# -gt 0 ]; do
     break
     ;;
   -*)
-    # if unrecognized option, treat it and all follow args as args
+    # if unrecognized option, treat it and all follow arguments as args
     args=(${args[@]:+"${args[@]}"} "$@")
     break
     ;;
   *)
-    # if not option, treat all follow args as args
+    # if not option, treat all follow arguments as args
     args=(${args[@]:+"${args[@]}"} "$@")
     break
     ;;

bin/c

@@ -111,7 +111,7 @@ while [ $# -gt 0 ]; do
     usage 2 "unrecognized option '$1'"
     ;;
   *)
-    # if not option, treat all follow args as command
+    # if not option, treat all follow arguments as command
     target_command=(${target_command[@]:+"${target_command[@]}"} "$@")
     break
     ;;

bin/coat

@@ -44,9 +44,7 @@ colorLines() {
   # How to use `while read` (Bash) to read the last line in a file
   #   if there’s no newline at the end of the file?
   # https://stackoverflow.com/questions/4165135
-  if [ -n "$line" ]; then
-    rotateColorPrint "$line"
-  fi
+  [ -z "$line" ] || rotateColorPrint "$line"
 }
 
 if [ $# == 0 ]; then

bin/cp-into-docker-run

@@ -164,7 +164,7 @@ while (($# > 0)); do
     usage 2 "$PROG: unrecognized option '$1'"
     ;;
   *)
-    # if not option, treat all follow args as command
+    # if not option, treat all follow arguments as command
     args=(${args[@]:+"${args[@]}"} "$@")
     break
     ;;

bin/find-in-jars

@@ -349,7 +349,7 @@ searchJarFiles() {
 
   total_jar_count=$(printf '%s\n' "$jar_files" | wc -l)
   # remove white space, because the `wc -l` output on mac contains white space!
-  total_jar_count=${total_jar_count//[[:space:]]}
+  total_jar_count=${total_jar_count//[[:space:]]/}
 
   echo "$total_jar_count"
   printf '%s\n' "$jar_files"
@@ -370,13 +370,9 @@ __outputResultOfJarFile() {
     # - https://stackoverflow.com/questions/19120263/why-exit-code-141-with-grep-q
     # - https://unix.stackexchange.com/questions/305547/broken-pipe-when-grepping-output-but-only-with-i-flag
     # - http://www.pixelbeat.org/programming/sigpipe_handling.html
-    if grep -c "${grep_opt_args[@]}" &>/dev/null; then
-      matched=true
-    fi
+    grep -c "${grep_opt_args[@]}" &>/dev/null && matched=true
 
-    if [ "$print_matched_files" != "$matched" ]; then
-      return
-    fi
+    [ "$print_matched_files" != "$matched" ] && return
 
     clearResponsiveMessage
     if [ -t 1 ]; then

bin/show-busy-java-threads

@@ -303,7 +303,7 @@ isNaturalNumber "$update_count" || die "update count($update_count) is not a nat
 readonly update_count
 
 if [ -n "$pid_list" ]; then
-  pid_list=${pid_list//[[:space:]]} # delete white space
+  pid_list=${pid_list//[[:space:]]/} # delete white space
   isNaturalNumberList "$pid_list" || die "pid(s)($pid_list) is illegal! example: 42 or 42,99,67"
 fi
 readonly pid_list

bin/taoc

@@ -44,9 +44,7 @@ colorLines() {
   # How to use `while read` (Bash) to read the last line in a file
   #   if there’s no newline at the end of the file?
   # https://stackoverflow.com/questions/4165135
-  if [ -n "$line" ]; then
-    rotateColorPrint "$line"
-  fi
+  [ -z "$line" ] || rotateColorPrint "$line"
 }
 
 tac "$@" | colorLines