Merge branch 'main' of github.com:duckwork/etc

7 files changed, 58 insertions, 35 deletions

@@ -14,7 +14,7 @@ for cmd in "${sudo_cmds[@]}"; do
 done
 
 # LS
-alias ls='ls -F --color=auto'
+alias ls='ls -F --color=never'
 alias ll='ls -l'
 # tree
 alias tree='tree -F'
@@ -15,28 +15,41 @@ BASH_SOURCE_LAST=(
 
 for f in "${BASH_SOURCE_FIRST[@]}"; do
     file="${XDG_CONFIG_HOME:-$HOME/.config}/bash/$f.bash"
-    [[ -r "$file" ]] && source "$file" # || echo >&2 "no '$file' found"
+    if [[ -r "$file" ]]; then
+        # echo >&2 "Sourcing '$file'"
+        source "$file"
+    else
+        :
+        # echo >&2 "No '$file' found"
+    fi
 done
 
 for file in "$XDG_CONFIG_HOME"/bash/*.bash; do
     file_base="${file##*/}"
-    memq "${file_base%.bash}" "${BASH_SOURCE_FIRST[@]}" && {
+    if memq "${file_base%.bash}" "${BASH_SOURCE_FIRST[@]}"; then
         # echo >&2 "'$file' in BASH_SOURCE_FIRST, skipping"
         continue
-    }
-    memq "${file_base%.bash}" "${BASH_SOURCE_LAST[@]}" && {
+    elif memq "${file_base%.bash}" "${BASH_SOURCE_LAST[@]}"; then
         # echo >&2 "'$file' in BASH_SOURCE_LAST, skipping"
         continue
-    }
-    [[ -r "$file" ]] && {
+    elif [[ -r "$file" ]]; then
         # echo >&2 "Sourcing '$file'"
         source "$file"
-    }
+    else
+        :
+        # echo >&2 "No '$file' found"
+    fi
     unset file_base
 done
 
 for f in "${BASH_SOURCE_LAST[@]}"; do
     file="${XDG_CONFIG_HOME:-$HOME/.config}/bash/$f.bash"
-    [[ -r "$file" ]] && source "$file" # || echo >&2 "no '$file' found"
-    true
+    if [[ -r "$file" ]]; then
+        source "$file"
+    else
+        :
+        #echo >&2 "No '$file' found"
+    fi
 done
+
+true
@@ -1,7 +1,15 @@
-# source completions
+# Completions.bash
+# Source bash completion libraries
 
-. /etc/bash_completion
+POSSIBLE_COMPLETION_FILES=(
+    /etc/bash_completion # Debian
+    /etc/profile.d/bash_completion.sh # Alpine
+    # I'm sure there are many more
+)
 
-# for file in /etc/bash_completion.d/*; do
-#               [ -r "$file" ] && source "$file"
-# done
+for candidate in "${POSSIBLE_COMPLETION_FILES[@]}"; do
+    if [[ -r "$candidate" ]]; then
+        source "$candidate"
+        break # XXX: Do I want this?
+    fi
+done
@@ -1,3 +1,5 @@
+# Functions
+
 memq() { # memq ITEM ARRAY
     ## Test whether an ITEM is a member of ARRAY.
     ## Pass ARRAY as ${ARRAY[@]}.
@@ -28,3 +30,16 @@ first_which() { # first_which COMMAND...
         shift
     done
 }
+
+please() { # please [COMMAND...]
+    # if run without arguments, run the last command with 'sudo' (aka sudo !!)
+    # if run WITH arguments, alias as sudo
+    history -d -1
+    if [ -z "$1" ]; then
+        #set -- $(HISTTIMEFORMAT=$'\t' history 2 | sed 's/^.*\t//;q')
+        set -- $(fc -lnr | sed 1q)
+    fi
+    echo >&2 sudo "$@"
+    history -s sudo "$@"
+    "${DEBUG:-false}" || sudo "$@"
+}
@@ -3,7 +3,7 @@ export MANWIDTH=80
 # on smaller terminals, use their width
 # (cf. https://wiki.archlinux.org/index.php/Man_page#Page_width)
 man() {
-        local width=$(tput cols)
-        [ $width -gt $MANWIDTH ] && width=$MANWIDTH
-        env MANWIDTH=$width man "$@"
+    local width=$COLUMNS # bashism!
+    [ $width -gt $MANWIDTH ] && width=$MANWIDTH
+    env MANWIDTH=$width man "$@"
 }
@@ -1,14 +0,0 @@
-# PLEASE
-# if run without arguments, run the last command with 'sudo' (aka sudo !!)
-# if run WITH arguments, alias as sudo
-
-please() {
-        history -d -1
-        if [ -z "$1" ]; then
-                #set -- $(HISTTIMEFORMAT=$'\t' history 2 | sed 's/^.*\t//;q')
-                set -- $(fc -lnr | sed 1q)
-        fi
-        echo >&2 sudo "$@"
-        history -s sudo "$@"
-        "${DEBUG:-false}" || sudo "$@"
-}
@@ -9,9 +9,10 @@ PS1+='\[\e[0;46m\]\u@\h \w'
 # git bit
 # see https://unix.stackexchange.com/questions/278206
 possible_git_prompt_locations=(
-        /usr/share/git/git-prompt.sh # Arch, etc. (default?)
-        /usr/lib/git-core/git-sh-prompt # Debian, Ubuntu ...
-        /usr/share/git-core/contrib/completion/git-prompt.sh # Fedora ??
+    /usr/share/git/git-prompt.sh # Arch, etc. (default?)
+    /usr/lib/git-core/git-sh-prompt # Debian, Ubuntu ...
+    /usr/share/git-core/contrib/completion/git-prompt.sh # Fedora ??
+    # I have yet to find Alpine's git prompt location.
 )
 
 for file in "${possible_git_prompt_locations[@]}"; do