Use standard structure for if/for in shell

Mostly for clarity reasons; using this syntax:

    if [ condition ]; then
        commands
    fi

As opposed to:

    if [ condition ]
    then
        commands
    fi

Or:

    [ condition ] && command

1 files changed, 9 insertions, 6 deletions

diff --git a/bash/bashrc.d/grep.bash b/bash/bashrc.d/grep.bash
index f2586562..62acdb01 100644
--- a/bash/bashrc.d/grep.bash
+++ b/bash/bashrc.d/grep.bash
@@ -2,12 +2,15 @@
 __grepopts() {
     local grepopts='-I'
     local grephelp="$(grep --help 2>/dev/null)"
-    [[ "$grephelp" == *--color* ]] \
-        && grepopts="${grepopts} --color=auto"
-    [[ "$grephelp" == *--exclude* ]] \
-        && grepopts="${grepopts} --exclude=.git{,ignore,modules}"
-    [[ "$grephelp" == *--exclude-dir* ]] \
-        && grepopts="${grepopts} --exclude-dir=.{cvs,git,hg,svn}"
+    if [[ "$grephelp" == *--color* ]]; then
+        grepopts="${grepopts} --color=auto"
+    fi
+    if [[ "$grephelp" == *--exclude* ]]; then
+        grepopts="${grepopts} --exclude=.git{,ignore,modules}"
+    fi
+    if [[ "$grephelp" == *--exclude-dir* ]]; then
+        grepopts="${grepopts} --exclude-dir=.{cvs,git,hg,svn}"
+    fi
     printf '%s' "$grepopts"
 }