xavier/config-bash
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

style: Normalize variable expansions to ${var} across the repo

Browse Source 
Replace bare $var with ${var} everywhere it was still used, matching
the convention already established in rc.d/prompt and rc.d/history.
Positional parameters ($1, $@, $#) and special variables ($?, $$, $-)
are left as-is, consistent with existing usage in _helpers.bash.

rc.d/broot is auto-generated by the broot binary and will likely be
overwritten with its original formatting on the next broot update.
This commit is contained in:
xavier
2026-08-22 00:55:39 +02:00
parent 6a53ee36fd
commit df189f9ec1
23 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_helpers.bash
+9 -9
View File
@@ -4,22 +4,22 @@ function basedir() {
function _source_file_if_exists() {
if [ -r "$1" ]; then
test -n "$DEBUG_BASHRC" && echo "-- Sourcing file $1"
test -n "${DEBUG_BASHRC}" && echo "-- Sourcing file $1"
source "$1"
fi
}
function _source_dir_files() {
if [ -d "$1" ]; then
test -n "$DEBUG_BASHRC" && echo "-- Sourcing files in directory $1"
test -n "${DEBUG_BASHRC}" && echo "-- Sourcing files in directory $1"
# Safe loops for empty dirs
shopt -s nullglob
for file in "$1"/*; do
if [ -e "$file" ]; then
test -n "$DEBUG_BASHRC" && echo " * sourcing file $file"
source "$file"
if [ -e "${file}" ]; then
test -n "${DEBUG_BASHRC}" && echo " * sourcing file ${file}"
source "${file}"
fi
done
@@ -30,13 +30,13 @@ function _source_dir_files() {
# Source : https://superuser.com/questions/39751/add-directory-to-path-if-its-not-already-there
_path_add() {
if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then
PATH="${PATH:+"$PATH:"}$1"
if [ -d "$1" ] && [[ ":${PATH}:" != *":$1:"* ]]; then
PATH="${PATH:+"${PATH}:"}$1"
fi
}
_prompt_command_add() {
if [ -n "$1" ] && [[ ":$PROMPT_COMMAND:" != *":$1:"* ]]; then
PROMPT_COMMAND="${PROMPT_COMMAND:+"$PROMPT_COMMAND;"}$1"
if [ -n "$1" ] && [[ ":${PROMPT_COMMAND}:" != *":$1:"* ]]; then
PROMPT_COMMAND="${PROMPT_COMMAND:+"${PROMPT_COMMAND};"}$1"
fi
}
aliases.d/fun
+1 -1
View File
@@ -1,5 +1,5 @@
# Fun
alias matrix='tr -c "[:digit:]" " " < /dev/urandom | dd cbs=$COLUMNS conv=unblock | GREP_COLOR="1;32" grep --color "[^ ]"'
alias matrix='tr -c "[:digit:]" " " < /dev/urandom | dd cbs=${COLUMNS} conv=unblock | GREP_COLOR="1;32" grep --color "[^ ]"'
if (command -v beep &> /dev/null)
then
aliases.d/gentoo.bash
+1 -1
View File
@@ -1,4 +1,4 @@
if [ -f /etc/gentoo-release -a "$UID" -ne 0 ]
if [ -f /etc/gentoo-release -a "${UID}" -ne 0 ]
then
alias emerge='sudo emerge'
alias etc-update='sudo etc-update'
aliases.d/mc
+1 -1
View File
@@ -1,5 +1,5 @@
if (which mc &> /dev/null); then
if [ "$TERM" = "rxvt-unicode" ]; then
if [ "${TERM}" = "rxvt-unicode" ]; then
alias mc="TERM=rxvt-unicode-256color mc"
fi
fi
bashrc
+2 -2
View File
@@ -80,7 +80,7 @@ _source_dir_files "${BASH_CONFIG_DIR}"/aliases.d
# Source bash completion definitions
# TODO: Améliorer cette partie pour éviter les erreurs quand aucun fichier n'existe
for file in /etc/bash*completion /etc/profile.d/bash*completion*; do source "$file"; done
for file in /etc/bash*completion /etc/profile.d/bash*completion*; do source "${file}"; done
_source_file_if_exists ~/.bash_completion
_source_file_if_exists "${BASH_CONFIG_DIR}"/completion
@@ -89,7 +89,7 @@ _source_dir_files "${BASH_CONFIG_DIR}"/completion.d
_source_dir_files ~/.nix-profile/share/bash-completion/completions
if (command -v _complete_alias &>/dev/null); then
for alias in $(alias -p | awk '{print $2}' | awk -F= '{print $1}'); do complete -o default -F _complete_alias "$alias"; done
for alias in $(alias -p | awk '{print $2}' | awk -F= '{print $1}'); do complete -o default -F _complete_alias "${alias}"; done
fi
# Late customization
functions.d/devenv
+1 -1
View File
@@ -9,7 +9,7 @@ function devenv() {
if [ "${status}" != "RUNNING" ]; then lxc start devenv; fi
# Rename tmux window if inside tmux
if [ -n "$TMUX" ]; then tmux rename-window "devenv"; fi
if [ -n "${TMUX}" ]; then tmux rename-window "devenv"; fi
# Login as user xavier
lxc exec devenv -- login -f xavier
libs/note.bash
+5 -5
View File
@@ -1,17 +1,17 @@
note() {
# if file doesn't exist, create it
if [[ ! -f $HOME/.notes ]]; then
touch "$HOME"/.notes
if [[ ! -f "${HOME}/.notes" ]]; then
touch "${HOME}"/.notes
fi
if [[ $# -eq 0 ]]; then
# no arguments, print file
cat "$HOME"/.notes
cat "${HOME}"/.notes
elif [[ "$1" == "-c" ]]; then
# clear file
echo "" >"$HOME"/.notes
echo "" >"${HOME}"/.notes
else
# add all arguments to file
echo "$@" >>"$HOME"/.notes
echo "$@" >>"${HOME}"/.notes
fi
}
libs/password.bash
+13 -13
View File
@@ -1,21 +1,21 @@
encpasswd() {
local password_clear=$1
local password_md5hash=$(openssl passwd -1 "$password_clear")
local password_sha1=$(echo -n "$password_clear" | openssl dgst -sha1)
echo "Password : $password_clear"
echo "MD5HASH : $password_md5hash"
echo "SHA1 : $password_sha1"
local password_md5hash=$(openssl passwd -1 "${password_clear}")
local password_sha1=$(echo -n "${password_clear}" | openssl dgst -sha1)
echo "Password : ${password_clear}"
echo "MD5HASH : ${password_md5hash}"
echo "SHA1 : ${password_sha1}"
}
genpasswd() {
local l=$1
[ "$l" == "" ] && l=12
[ "${l}" == "" ] && l=12
local password_clear=$(tr -dc A-Za-z0-9_ </dev/urandom | head -c "${l}" | xargs)
local password_md5hash=$(openssl passwd -1 "$password_clear")
local password_sha1=$(echo -n "$password_clear" | openssl dgst -sha1)
local password_base64=$(echo -n "$password_clear" | base64)
echo "Password : $password_clear"
echo "Base64 : $password_base64"
echo "MD5HASH : $password_md5hash"
echo "SHA1 : $password_sha1"
local password_md5hash=$(openssl passwd -1 "${password_clear}")
local password_sha1=$(echo -n "${password_clear}" | openssl dgst -sha1)
local password_base64=$(echo -n "${password_clear}" | base64)
echo "Password : ${password_clear}"
echo "Base64 : ${password_base64}"
echo "MD5HASH : ${password_md5hash}"
echo "SHA1 : ${password_sha1}"
}
libs/term.bash
+1 -1
View File
@@ -1,5 +1,5 @@
function term_change_title {
case $TERM in
case ${TERM} in
# Change the window title of X terminals
xterm* | rxvt* | urxvt* | Eterm)
echo -ne "\033]0;${1}\007"
libs/todo.bash
+8 -8
View File
@@ -1,20 +1,20 @@
todo() {
if [[ ! -f $HOME/.todo ]]; then
touch $HOME/.todo
if [[ ! -f "${HOME}/.todo" ]]; then
touch "${HOME}/.todo"
fi
if [[ $# -eq 0 ]]; then
cat $HOME/.todo
cat "${HOME}/.todo"
elif [[ "$1" == "-l" ]]; then
cat -n $HOME/.todo
cat -n "${HOME}/.todo"
elif [[ "$1" == "-c" ]]; then
echo "" > $HOME/.todo
echo "" > "${HOME}/.todo"
elif [[ "$1" == "-r" ]]; then
cat -n $HOME/.todo
cat -n "${HOME}/.todo"
echo -ne "----------------------------\nType a number to remove: "
read NUMBER
sed -ie ${NUMBER}d $HOME/.todo
sed -ie "${NUMBER}d" "${HOME}/.todo"
else
echo "$@" >> $HOME/.todo
echo "$@" >> "${HOME}/.todo"
fi
}
profile.d/anyenv
+3 -3
View File
@@ -1,8 +1,8 @@
# https://github.com/riywo/anyenv
# git clone https://github.com/riywo/anyenv $HOME/.anyenv
# git clone https://github.com/riywo/anyenv ${HOME}/.anyenv
if [ -d "$HOME/.anyenv/bin" ]
if [ -d "${HOME}/.anyenv/bin" ]
then
export PATH="$HOME/.anyenv/bin:$PATH"
export PATH="${HOME}/.anyenv/bin:${PATH}"
fi
profile.d/krew
+1 -1
View File
@@ -1,3 +1,3 @@
if (command -v krew &>/dev/null); then
export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
export PATH="${KREW_ROOT:-${HOME}/.krew}/bin:${PATH}"
fi
profile.d/path
+4 -4
View File
@@ -1,6 +1,6 @@
# Customize PATH
if [ -d $HOME/.bin ] ; then export PATH=$PATH:$HOME/.bin ; fi
if [ -d $HOME/.local/bin ] ; then export PATH=$PATH:$HOME/.local/bin ; fi
if [ -d "${HOME}/.bin" ] ; then export PATH="${PATH}:${HOME}/.bin" ; fi
if [ -d "${HOME}/.local/bin" ] ; then export PATH="${PATH}:${HOME}/.local/bin" ; fi
if [ -d $HOME/bin ] ; then export PATH=$PATH:$HOME/bin ; fi
if [ -d $HOME/scripts ] ; then export PATH=$PATH:$HOME/scripts ; fi
if [ -d "${HOME}/bin" ] ; then export PATH="${PATH}:${HOME}/bin" ; fi
if [ -d "${HOME}/scripts" ] ; then export PATH="${PATH}:${HOME}/scripts" ; fi
rc.d/anyenv
+1 -1
View File
@@ -1,6 +1,6 @@
# https://github.com/riywo/anyenv
# git clone https://github.com/riywo/anyenv $HOME/.anyenv
# git clone https://github.com/riywo/anyenv ${HOME}/.anyenv
if (which anyenv &>/dev/null); then
eval "$(anyenv init -)"
rc.d/asdf
+3 -3
View File
@@ -8,7 +8,7 @@ if [ -f ~/.asdf/asdf.sh ]; then
fi
if [ -f "$HOME/.nix-profile/share/asdf-vm/asdf.sh" ]; then
. "$HOME/.nix-profile/share/asdf-vm/asdf.sh"
. "$HOME/.nix-profile/share/bash-completion/completions/asdf.bash"
if [ -f "${HOME}/.nix-profile/share/asdf-vm/asdf.sh" ]; then
. "${HOME}/.nix-profile/share/asdf-vm/asdf.sh"
. "${HOME}/.nix-profile/share/bash-completion/completions/asdf.bash"
fi
rc.d/broot
+6 -6
View File
@@ -8,14 +8,14 @@ if (command -v broot &>/dev/null); then
function br {
local cmd cmd_file code
cmd_file=$(mktemp)
if broot --outcmd "$cmd_file" "$@"; then
cmd=$(<"$cmd_file")
rm -f "$cmd_file"
eval "$cmd"
if broot --outcmd "${cmd_file}" "$@"; then
cmd=$(<"${cmd_file}")
rm -f "${cmd_file}"
eval "${cmd}"
else
code=$?
rm -f "$cmd_file"
return "$code"
rm -f "${cmd_file}"
return "${code}"
fi
}
fi
rc.d/cgroups
+5 -5
View File
@@ -1,5 +1,5 @@
# Use cgroups
if [ "$PS1" ] ; then
if [ "${PS1}" ] ; then
if [ -d /sys/fs/cgroup ] ; then
cdir=/sys/fs/cgroup
@@ -7,10 +7,10 @@ if [ "$PS1" ] ; then
cdir=/dev/cgroup
fi
if [ -d "$cdir/user" ]; then
mkdir -p -m 0700 $cdir/user/$$ > /dev/null 2>&1
/bin/echo $$ > $cdir/user/$$/tasks
/bin/echo '1' > $cdir/user/$$/notify_on_release
if [ -d "${cdir}/user" ]; then
mkdir -p -m 0700 "${cdir}/user/$$" > /dev/null 2>&1
/bin/echo $$ > "${cdir}/user/$$/tasks"
/bin/echo '1' > "${cdir}/user/$$/notify_on_release"
unset -v cdir
fi
rc.d/rvm
+3 -3
View File
@@ -1,8 +1,8 @@
# Load RVM into a shell session *as a function*
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
[[ -s "${HOME}/.rvm/scripts/rvm" ]] && source "${HOME}/.rvm/scripts/rvm"
# Source bash completion for RVM
[[ -r "$HOME/.rvm/scripts/completion" ]] && source "$HOME/.rvm/scripts/completion"
[[ -r "${HOME}/.rvm/scripts/completion" ]] && source "${HOME}/.rvm/scripts/completion"
# Add RVM to PATH for scripting
[[ -r "$HOME/.rvm/bin" ]] && PATH=$PATH:$HOME/.rvm/bin
[[ -r "${HOME}/.rvm/bin" ]] && PATH="${PATH}:${HOME}/.rvm/bin"
rc.d/screen
+1 -1
View File
@@ -1,7 +1,7 @@
# GNU Screen stuff
if ( which screen &> /dev/null )
then
if [[ $TERM != screen* ]]
if [[ ${TERM} != screen* ]]
then
if [ "$(screen -ls | sed -ne 's/[[:space:]]//' -ne 's/(Attached)// p')" ]
then
rc.d/startx
+4 -4
View File
@@ -1,10 +1,10 @@
# Auto startx depending on the VT
if [[ -z "$DISPLAY" && $(id -u) -ge 1000 ]] ; then
if [[ -z "${DISPLAY}" && $(id -u) -ge 1000 ]] ; then
TTY=$(tty)
if [ "$TTY" == "not a tty" ]; then return; fi
if [ "${TTY/tty}" != "$TTY" -a $(basename ${TTY/tty}) -le 3 ]
if [ "${TTY}" == "not a tty" ]; then return; fi
if [ "${TTY/tty}" != "${TTY}" -a "$(basename "${TTY/tty}")" -le 3 ]
then
case $(tty | cut -b9-) in
@@ -20,7 +20,7 @@ if [[ -z "$DISPLAY" && $(id -u) -ge 1000 ]] ; then
if ( which startx &> /dev/null )
then
$EXEC startx 1> ~/.log/xsession-errors 2>&1 -- $VT
${EXEC} startx 1> ~/.log/xsession-errors 2>&1 -- "${VT}"
fi
fi
fi
rc.d/terminal-title
+5 -5
View File
@@ -6,14 +6,14 @@ _update_terminal_title() {
if [ -n "${KUBECONFIG}" ]; then
if command -v kubectl >/dev/null 2>&1; then
kubecontext=$(kubectl config current-context 2>/dev/null)
if [ -n "$kubecontext" ]; then
if [ -n "${kubecontext}" ]; then
title="󱃾 ${kubecontext}"
fi
fi
fi
# If no title is already set, check if we're in $HOME
if [ -z "${title}" ] && [ "$PWD" = "$HOME" ]; then
# If no title is already set, check if we're in ${HOME}
if [ -z "${title}" ] && [ "${PWD}" = "${HOME}" ]; then
title="󱂵 ~"
fi
@@ -35,7 +35,7 @@ _update_terminal_title() {
# Set the title in tmux or terminal window
if [ -n "${title}" ]; then
if [ -n "$TMUX" ]; then
if [ -n "${TMUX}" ]; then
tmux rename-window "${title}"
else
printf '\033]0;%s\007' "${title}"
@@ -44,4 +44,4 @@ _update_terminal_title() {
}
# Add the function to the PROMPT_COMMAND variable to have regular updates
if [ "$TERM" != "linux" ]; then _prompt_command_add "_update_terminal_title"; fi
if [ "${TERM}" != "linux" ]; then _prompt_command_add "_update_terminal_title"; fi
rc.d/tmux
+2 -2
View File
@@ -1,7 +1,7 @@
# GNU Screen stuff
if (command -v tmux &>/dev/null); then
if [ "$(pgrep -u "$UID" "tmux" | wc -l)" -gt 0 ]; then
if [[ $TERM != screen* ]]; then
if [ "$(pgrep -u "${UID}" "tmux" | wc -l)" -gt 0 ]; then
if [[ ${TERM} != screen* ]]; then
nb_sessions=$(tmux list-session | wc -l)
nb_sessions_attached=$(tmux list-session | grep -c "attached")
nb_sessions_detached=$(tmux list-session | grep -c -v "attached")
rc.d/urxvt
+3 -3
View File
@@ -6,16 +6,16 @@
## Quick functions
#
#zp() {
# URXVT_FONT_SIZE=$(echo "$URXVT_FONT_SIZE+$URXVT_FONT_INCREMENT" | bc )
# URXVT_FONT_SIZE=$(echo "${URXVT_FONT_SIZE}+${URXVT_FONT_INCREMENT}" | bc )
# urxvt_set_font "${URXVT_FONT_NAME}:size=${URXVT_FONT_SIZE}"
#}
#
#zm() {
# URXVT_FONT_SIZE=$(echo "$URXVT_FONT_SIZE-$URXVT_FONT_INCREMENT" | bc )
# URXVT_FONT_SIZE=$(echo "${URXVT_FONT_SIZE}-${URXVT_FONT_INCREMENT}" | bc )
# urxvt_set_font "${URXVT_FONT_NAME}:size=${URXVT_FONT_SIZE}"
#}
#
#if [ -z "$SSH_CONNECTION" ]
#if [ -z "${SSH_CONNECTION}" ]
#then
# urxvt_set_font "${URXVT_FONT_NAME}:size=${URXVT_FONT_SIZE}"
#fi