From 8e7829492005649d32ad91c41f380065fcea5562 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Thu, 17 Feb 2022 21:26:00 -0800
Subject: [PATCH] aliases/general: cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- use `-A` instead of `-a` for `ls`,
- quote variable expansions,
- don’t *assign* default expansions,
- don’t alias `piano` without `pianobar`,
- enable `bash-it` aliases in the default profile…
---
 aliases/available/general.aliases.bash | 21 +++++++++++----------
 profiles/default.bash_it               |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 42930ab4..ba4cac1b 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -1,4 +1,5 @@
 # shellcheck shell=bash
+# shellcheck source-path=SCRIPTDIR
 about-alias 'general aliases'
 
 if command ls --color -d . &> /dev/null; then
@@ -9,16 +10,16 @@ fi
 # List directory contents
 alias sl=ls
 alias la='ls -AF' # Compact view, show hidden
-alias ll='ls -al'
-alias l='ls -a'
+alias ll='ls -Al'
+alias l='ls -A'
 alias l1='ls -1'
 alias lf='ls -F'
 
 alias _='sudo'
 
 # Shortcuts to edit startup files
-alias vbrc='${VISUAL:-vim} ~/.bashrc'
-alias vbpf='${VISUAL:-vim} ~/.bash_profile'
+alias vbrc='"${VISUAL:-vim}" ~/.bashrc'
+alias vbpf='"${VISUAL:-vim}" ~/.bash_profile'
 
 # colored grep
 # Need to check an existing file for a pattern that will be found to ensure
@@ -35,11 +36,11 @@ alias c='clear'
 alias cls='clear'
 
 alias edit='${EDITOR:-${ALTERNATE_EDITOR?}}'
-alias pager='${PAGER:=less}'
+alias pager='${PAGER:-less}'
 
 alias q='exit'
 
-alias irc='${IRC_CLIENT:=irc}'
+alias irc='${IRC_CLIENT:-irc}'
 
 # Language aliases
 alias rb='ruby'
@@ -47,8 +48,9 @@ alias py='python'
 alias ipy='ipython'
 
 # Pianobar can be found here: http://github.com/PromyLOPh/pianobar/
-
+if _command_exists pianobar; then
 alias piano='pianobar'
+fi
 
 alias ..='cd ..'         # Go up one directory
 alias cd..='cd ..'       # Common misspelling for going up one directory
@@ -72,8 +74,8 @@ alias rd='rmdir'
 alias xt='extract'
 
 # sudo editors
-alias svim='sudo ${VISUAL:-vim}'
-alias snano='sudo nano'
+alias svim='sudo "${VISUAL:-vim}"'
+alias snano='sudo "${ALTERNATE_EDITOR:-nano}"'
 
 # Display whatever file is regular file or folder
 function catt() {
@@ -92,5 +94,4 @@ function catt() {
 # aliases and enable just the ones for Bash-it explicitly:
 # bash-it disable alias general
 # bash-it enable alias bash-it
-# shellcheck source-path=SCRIPTDIR
 source "$BASH_IT/aliases/available/bash-it.aliases.bash"
diff --git a/profiles/default.bash_it b/profiles/default.bash_it
index 9a55f6c7..9eab8a47 100644
--- a/profiles/default.bash_it
+++ b/profiles/default.bash_it
@@ -10,3 +10,4 @@ completion system
 
 # aliases
 aliases general
+aliases bash-it