fix .helpers/foreach-script

.helpers/foreach-script

@@ -10,6 +10,11 @@
 
 VERBOSE=${VERBOSE:="0"}
 
+__is_file_bash_or_sh() {
+  [[ ${1} == *.bash || ${1} == *.sh ]] ||
+    file "${1}" | grep -qE 'shell script|POSIX shell script|Bourne-Again shell script|bash script|a sh script'
+}
+
 mapfile -d '' -t files < <(
   find ./ \
     -type f \
@@ -21,7 +26,7 @@ mapfile -d '' -t files < <(
 status=0
 
 for file in "${files[@]}"; do
-  if file "${file}" | grep -qE 'shell script|POSIX shell script|Bourne-Again shell script|bash script|a sh script'; then
+  if __is_file_bash_or_sh "${file}"; then
     [[ ${VERBOSE} == "1" ]] && echo "${*} ${file}"
     "${@}" "${file}" || status=1
   fi

.helpers/shellcheck

@@ -15,9 +15,11 @@ fi
   --exclude=SC2012 \
   --exclude=SC2002 \
   --exclude=SC2059 \
-  --exclude=SC2181
+  --exclude=SC2181 \
+  --exclude=SC1091
 
 # SC2012 (info): Use find instead of ls to better handle non-alphanumeric filenames. https://www.shellcheck.net/wiki/SC2012
 # SC2059 (info): Don't use variables in the printf format string. https://www.shellcheck.net/wiki/SC2059
 # SC2002 (style): Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead. https://www.shellcheck.net/wiki/SC2002
 # SC2181 (style): Check exit code directly with e.g. 'if ! mycmd;', not indirectly with $?. https://www.shellcheck.net/wiki/SC2181
+# SC1091 (info): Not following: /usr/share/fzf/shell/key-bindings.bash: openBinaryFile: does not exist (No such file or directory). https://www.shellcheck.net/wiki/SC1091

README.md

@@ -16,7 +16,3 @@ Run `install`.
 $ ln -s /path/to/dotfiles/root.bash ~/.dotfiles.bash
 $ echo '[[ -r ~/.dotfiles.bash ]] && [[ -f ~/.dotfiles.bash ]] && source ~/.dotfiles.bashh' >> ~/.bashrc
 ```
-
-#### Notes
-
-Create the file `~/.path` and put what ever path that you want to be included to PATH (paths can contain environment variables).

bin/colors-sample

@@ -84,7 +84,7 @@ __msg2() {
 }
 
 __boxline() {
-  for v in "$@"; do
+  for v in "${@}"; do
     __msg2 "${v}"
   done
   echo ""

bin/provides

@@ -2,10 +2,10 @@
 
 case "$(what-pm)" in
   "dnf")
-    dnf provides "$@"
+    dnf provides "${@}"
     ;;
   "apt")
-    dpkg -S "$@"
+    dpkg -S "${@}"
     ;;
   *)
     echo "this script does not supports this distro"

config/gnome/lib/display-colors

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
-# shellcheck disable=SC1090
-source "$1"
+# https://www.shellcheck.net/wiki/SC1090
+# shellcheck source=/dev/null
+source "${1}"
 
 echo "FG                : ${C_FG}"
 echo "BG                : ${C_BG}"

lib/00-common.bash

@@ -15,4 +15,3 @@ bb() {
   local cmd='source-highlight --no-doc --out-format=esc --tab=2'
   ${cmd} --infer-lang --input "${@}" 2>/dev/null || ${cmd} --src-lang=shell --input "${@}"
 }
-

lib/00-homebrew.bash

@@ -5,6 +5,8 @@ init-linuxbrew() {
   if [ -d "${HOMEBREW_PREFIX}/etc/bash_completion.d" ]; then
     for rc in "${HOMEBREW_PREFIX}/etc/bash_completion.d"/*; do
       if [ -f "${rc}" ]; then
+        # https://www.shellcheck.net/wiki/SC1090
+        # shellcheck source=/dev/null
         source "${rc}"
       fi
     done
@@ -20,13 +22,16 @@ case "$(uname)" in
 
     if [[ -r "${HOMEBREW_PREFIX}/etc/profile.d/bash_completion.sh" ]]; then
       export BASH_COMPLETION_COMPAT_DIR="${HOMEBREW_PREFIX}/etc/bash_completion.d"
+      # https://www.shellcheck.net/wiki/SC1090
+      # shellcheck source=/dev/null
       source "${HOMEBREW_PREFIX}/etc/profile.d/bash_completion.sh"
     fi
     ;;
 
   "Linux")
-    [[ "${__DISABLE_LINUXBREW}" == 'true' ]] && return 0
+    [[ ${__DISABLE_LINUXBREW} == 'true' ]] && return 0
     init-linuxbrew
     ;;
 
+  *) ;;
 esac

lib/00-pathmixer.bash

@@ -1,26 +1,15 @@
 path-add() {
-  if [[ "${1}" == "" ]]; then
+  if [[ ${1} == "" ]]; then
     return
   fi
 
-  if [[ ":${PATH}:" != *":${1}:"* ]] ; then
-    if [[ "${2}" = "after" ]] ; then
+  if [[ ":${PATH}:" != *":${1}:"* ]]; then
+    if [[ ${2} == "after" ]]; then
       PATH=${PATH}:${1}
     else
       PATH=${1}:${PATH}
     fi
   fi
 
-  export PATH;
-}
-
-load-path-file() {
-  if [ -f ~/.path ]; then
-    while read p; do
-      [[ ${p} = "" ]] && continue
-      p=$(eval echo \"${p}\")
-      path-add ${p}
-    done < ~/.path
-    unset p
-  fi
+  export PATH
 }

lib/10-linux.bash

@@ -4,12 +4,11 @@ fi
 
 ################################################################################
 ######### Paths ################################################################
-path-add ${HOME}/.local/bin
-path-add ${HOME}/bin
+path-add "${HOME}/.local/bin"
+path-add "${HOME}/bin"
 ################################################################################
 ################################################################################
 
-
 ################################################################################
 ######### Aliases and Functions ################################################
 alias O='xdg-open'
@@ -30,7 +29,7 @@ alias dnf-display-package-contents='dnf repoquery -l'
 alias dnf-display-local-package-contents='dnf repoquery --installed -l'
 
 sizes-files() {
-  du --human-readable --max-depth=1 --all  | sort --human-numeric-sort --reverse
+  du --human-readable --max-depth=1 --all | sort --human-numeric-sort --reverse
 }
 export -f sizes-files
 sizes-disks() {
@@ -52,5 +51,5 @@ export -f apt-clean-uninstalled
 
 export EDITOR=/usr/bin/vim
 
-[[ -e $HOME/.dir_colors ]] && eval "$(dircolors --bourne-shell ~/.dir_colors)"
+[[ -e "${HOME}/.dir_colors" ]] && eval "$(dircolors --bourne-shell "${HOME}/.dir_colors")"
 # dircolors --print-database > ~/.dir_colors

lib/10-macos.bash

@@ -46,13 +46,13 @@ if [[ -d "${HOMEBREW_PREFIX}/opt/curl/bin" ]]; then
   alias curl="\${HOMEBREW_PREFIX}/opt/curl/bin/curl"
 fi
 
-export LANG='en_US.UTF-8';
-export LC_ALL='en_US.UTF-8';
+export LANG='en_US.UTF-8'
+export LC_ALL='en_US.UTF-8'
 
 install-nano-nanorc() {
   touch ~/.nanorc
   for rcfile in "$(brew --prefix nano)"/share/nano/*.nanorc; do
-    echo "include ${rcfile}" >> ~/.nanorc
+    echo "include ${rcfile}" >>~/.nanorc
   done
 }
 

lib/20-ps1.bash

@@ -58,73 +58,67 @@
 ################################################################################
 
 __ps1_color() {
-  if [[ "$#" = 0 ]]; then
+  if [[ $# == 0 ]]; then
     printf "\[\e[0m\]"
   else
     printf "\[\e[${1};${2};${3}m\]"
   fi
 }
 
-declare -A __PS1_COLORS=( \
-  ["reset"]="$(__ps1_color)" \
-  ["prefix"]="$(__ps1_color 1 49 35)" \
-  ["main"]="$(__ps1_color 0 49 90)" \
-  ["seperator"]="$(__ps1_color 0 49 37)" \
-  ["user"]="$(__ps1_color 0 49 32)" \
-  ["root"]="$(__ps1_color 0 49 31)" \
-  ["path"]="$(__ps1_color 0 49 36)" \
-  ["git"]="$(__ps1_color 0 49 93)" \
-  ["gitwrap"]="$(__ps1_color 0 49 33)" \
-  ["kube_context"]="$(__ps1_color 1 49 34)" \
-  ["kube_nsp"]="$(__ps1_color 0 49 37)" \
+declare -A __PS1_COLORS=(
+  ["reset"]="$(__ps1_color)"
+  ["prefix"]="$(__ps1_color 1 49 35)"
+  ["main"]="$(__ps1_color 0 49 90)"
+  ["seperator"]="$(__ps1_color 0 49 37)"
+  ["user"]="$(__ps1_color 0 49 32)"
+  ["root"]="$(__ps1_color 0 49 31)"
+  ["path"]="$(__ps1_color 0 49 36)"
+  ["git"]="$(__ps1_color 0 49 93)"
+  ["gitwrap"]="$(__ps1_color 0 49 33)"
+  ["kube_context"]="$(__ps1_color 1 49 34)"
+  ["kube_nsp"]="$(__ps1_color 0 49 37)"
 )
 
-
-
 __ps1_seperator() {
   #local DSEP=${__PS1_SEPERATOR:-$' \u2423 '}  # https://codepoints.net/U+2423
   #local DSEP=${__PS1_SEPERATOR:-$' \u203F '}  # https://codepoints.net/U+203F
   #local DSEP=${__PS1_SEPERATOR:-$' \u2219 '}  # https://codepoints.net/U+2219
-  local DSEP=${__PS1_SEPERATOR:-$' \u2022 '}  # https://codepoints.net/U+2022
+  local DSEP=${__PS1_SEPERATOR:-$' \u2022 '} # https://codepoints.net/U+2022
   #local DSEP=${__PS1_SEPERATOR:-$' '}
-  printf "%s%s%s" "${__PS1_COLORS[seperator]}" "$DSEP" "${__PS1_COLORS[reset]}"
+  printf "%s%s%s" "${__PS1_COLORS[seperator]}" "${DSEP}" "${__PS1_COLORS[reset]}"
 }
 
-
 __ps1_user() {
   local disp=${__PS1_DISPLAY_USER:-false}
-  if [[  "${disp}" == 'false' ]] && [[ ! "`id -u`" -eq 0 ]]; then
+  if [[ ${disp} == 'false' ]] && [[ ! "$(id -u)" -eq 0 ]]; then
     return
   fi
 
   local USR="${__PS1_COLORS[user]}${USER}${__PS1_COLORS[reset]}"
-  if [[ "`id -u`" -eq 0 ]]; then
+  if [[ "$(id -u)" -eq 0 ]]; then
     USR="${__PS1_COLORS[root]}root${__PS1_COLORS[reset]}"
   fi
 
   printf "%s" "${USR}"
 }
 
-
 __ps1_host() {
   local disp=${__PS1_DISPLAY_HOSTNAME:-false}
-  if [[ "${disp}" == 'false' ]]; then
+  if [[ ${disp} == 'false' ]]; then
     return
   fi
 
-  local TO_PRINT=${__PS1_HOSTNAME:-$HOSTNAME}
+  local TO_PRINT=${__PS1_HOSTNAME:-${HOSTNAME}}
 
   printf "%s%s%s" "${__PS1_COLORS[user]}" "${TO_PRINT}" "${__PS1_COLORS[reset]}"
 }
 
-
 __ps1_pwd() {
   printf "%s\w%s" \
     "${__PS1_COLORS[path]}" \
     "${__PS1_COLORS[reset]}"
 }
 
-
 export GIT_PS1_SHOWDIRTYSTATE=true
 export GIT_PS1_SHOWUNTRACKEDFILES=true
 export GIT_PS1_SHOWUPSTREAM="verbose name"
@@ -139,7 +133,7 @@ __ps1_git() {
 
   local gitp
   gitp="$(__git_ps1 '%s')"
-  if [[ -n "${gitp}" ]]; then
+  if [[ -n ${gitp} ]]; then
     printf "%s%s%s%s%s%s" \
       "${__PS1_COLORS[gitwrap]}" \
       $'\uE0A0 ' \
@@ -150,9 +144,8 @@ __ps1_git() {
   fi
 }
 
-
 __ps1_kube() {
-  if [[ -z "${__PS1_DISPLAY_KUBE-}" ]] || [[ ! -x "$(command -v kubectl)" ]]; then
+  if [[ -z ${__PS1_DISPLAY_KUBE-} ]] || [[ ! -x "$(command -v kubectl)" ]]; then
     return
   fi
 
@@ -167,20 +160,20 @@ __ps1_join() {
   sep="$(__ps1_seperator)"
   local BUF=""
 
-  if [[ "$#" -eq 0 ]]; then
+  if [[ $# -eq 0 ]]; then
     return
   fi
 
   for fn in "${@}"; do
-    [[ -z "$fn" ]] && continue
-    if [[ "${BUF}" == "" ]]; then
+    [[ -z ${fn} ]] && continue
+    if [[ ${BUF} == "" ]]; then
       BUF="${fn}"
       continue
     fi
     BUF="${BUF}${sep}${fn}"
   done
 
-  printf "%s" "$BUF"
+  printf "%s" "${BUF}"
 }
 
 __ps1() {
@@ -201,9 +194,8 @@ __ps1() {
 
 export PROMPT_COMMAND=__ps1
 
-
 ps1-kube() {
-  if [[ -n "${__PS1_DISPLAY_KUBE-}" ]]; then
+  if [[ -n ${__PS1_DISPLAY_KUBE-} ]]; then
     unset __PS1_DISPLAY_KUBE
   else
     export __PS1_DISPLAY_KUBE=true

lib/21-starship.bash

@@ -1,4 +1,4 @@
-if command -v starship &> /dev/null; then
+if command -v starship &>/dev/null; then
   export STARSHIP_CONFIG="${DOTFILES_PATH}/config/starship/starship.toml"
   eval "$(starship init bash)"
 fi

lib/50-docker.bash

@@ -3,36 +3,43 @@ alias docker-clean-volumes='docker volume rm $(docker volume ls -qf dangling=tru
 docker-stop-all() {
   for i in $(docker ps --format "{{.Names}}"); do
     printf "Stoping %s ... " "${i}"
-    docker stop ${i} > /dev/null
-    if [ $? -eq 0 ]; then
+    docker stop "${i}" >/dev/null
+    if [[ $? -eq 0 ]]; then
       printf "\e[1;32mDone!\e[m\n"
     else
       printf "\e[1;31mFailed!\e[m\n"
     fi
   done
 }
 
-docker-clean-all() {( set -x
+docker-clean-all() { (
+  set -x
   # --force           Do not prompt for confirmation
   docker system prune --force
   docker image prune --force
   docker network prune --force
   docker volume prune --force
-)}
+); }
 
 if command -v dr 1>/dev/null 2>&1; then
+  # https://www.shellcheck.net/wiki/SC1090
+  # shellcheck source=/dev/null
   source <(dr --completion)
 fi
 
 ################################################################################
 ################# macos docker #################################################
 source-docker-bash-completion() {
   local etc=/Applications/Docker.app/Contents/Resources/etc
-  if [[ -f ${etc}/docker.bash-completion ]]; then
-    source ${etc}/docker.bash-completion
+  if [[ -f "${etc}/docker.bash-completion" ]]; then
+    # https://www.shellcheck.net/wiki/SC1090
+    # shellcheck source=/dev/null
+    source "${etc}/docker.bash-completion"
   fi
   if [[ -f ${etc}/docker-compose.bash-completion ]]; then
-    source ${etc}/docker-compose.bash-completion
+    # https://www.shellcheck.net/wiki/SC1090
+    # shellcheck source=/dev/null
+    source "${etc}/docker-compose.bash-completion"
   fi
 }
 export -f source-docker-bash-completion