From 2156a6726c577323162b5b42744cc1bd67efb2ac Mon Sep 17 00:00:00 2001
From: sinanmohd <sinan@firemail.cc>
Date: Tue, 4 Apr 2023 08:07:11 +0530
Subject: sh: clean: uniform shell expansion syntax

---
 .config/shell/init |  9 +++++----
 .profile           | 38 +++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/.config/shell/init b/.config/shell/init
index ffa5b56..5182fd7 100644
--- a/.config/shell/init
+++ b/.config/shell/init
@@ -1,4 +1,5 @@
 #!/bin/sh
+# shellcheck disable=SC2139
 
 export HISTSIZE=10000
 export SAVEHIST=10000
@@ -9,8 +10,8 @@ alias sudo='doas'
 alias yta='yt-dlp -f 251'
 alias genc='gpg -c --no-symkey-cache --cipher-algo AES256'
 alias gcc='gcc -Wvla -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -fsanitize=address'
-alias monerod="monerod --config-file=/etc/monerod.conf --data-dir $XDG_DATA_HOME/bitmonero"
+alias monerod="monerod --config-file=/etc/monerod.conf --data-dir ${XDG_DATA_HOME}/bitmonero"
 alias monero-wallet-cli="monero-wallet-cli --config-file ${HOME}/.config/monero/monero-wallet-cli.conf"
-alias mbsync="mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc" # $HOME clean up
-alias irssi="irssi --config="$XDG_CONFIG_HOME"/irssi/config --home="$XDG_DATA_HOME"/irssi" # $HOME clean up
-alias wget="wget --hsts-file="$XDG_DATA_HOME/wget-hsts"" # $HOME clean up
+alias mbsync="mbsync -c ${XDG_CONFIG_HOME}/isync/mbsyncrc" # $HOME clean up
+alias irssi="irssi --config=${XDG_CONFIG_HOME}/irssi/config --home=${XDG_DATA_HOME}/irssi" # $HOME clean up
+alias wget="wget --hsts-file=${XDG_DATA_HOME}/wget-hsts" # $HOME clean up
diff --git a/.profile b/.profile
index 63dabec..20e438a 100644
--- a/.profile
+++ b/.profile
@@ -1,16 +1,16 @@
 #!/bin/sh
 
 # user directories
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_STATE_HOME="$HOME/.local/state"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_DESKTOP_DIR="$HOME"
-export XDG_DOWNLOAD_DIR="$HOME/dl"
-export XDG_DOCUMENTS_DIR="$HOME/doc"
-export XDG_PICTURES_DIR="$HOME/pix"
-export XDG_MUSIC_DIR="$HOME/ms"
-export XDG_VIDEOS_DIR="$HOME/vid"
+export XDG_DATA_HOME="${HOME}/.local/share"
+export XDG_CONFIG_HOME="${HOME}/.config"
+export XDG_STATE_HOME="${HOME}/.local/state"
+export XDG_CACHE_HOME="${HOME}/.cache"
+export XDG_DESKTOP_DIR="${HOME}"
+export XDG_DOWNLOAD_DIR="${HOME}/dl"
+export XDG_DOCUMENTS_DIR="${HOME}/doc"
+export XDG_PICTURES_DIR="${HOME}/pix"
+export XDG_MUSIC_DIR="${HOME}/ms"
+export XDG_VIDEOS_DIR="${HOME}/vid"
 export GOPATH="${HOME}/.cache/go"
 
 # user programs
@@ -22,15 +22,15 @@ export SUDO_ASKPASS="${HOME}/.local/bin/sds/daskpass"
 export QT_QPA_PLATFORMTHEME=qt5ct
 
 # $HOME clean up
-export ANDROID_HOME="$XDG_DATA_HOME"/android
-export HISTFILE="${XDG_STATE_HOME}"/shell/history
-export CARGO_HOME="$XDG_DATA_HOME"/cargo
-export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nvidia
-export GNUPGHOME="$XDG_DATA_HOME"/gnupg
-export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
-export LESSHISTFILE="$XDG_STATE_HOME"/less/history
-export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
-export MBSYNCRC="$XDG_CONFIG_HOME"/isync/mbsyncrc
+export ANDROID_HOME="${XDG_DATA_HOME}/android"
+export HISTFILE="${XDG_STATE_HOME}/shell/history"
+export CARGO_HOME="${XDG_DATA_HOME}/cargo"
+export CUDA_CACHE_PATH="${XDG_CACHE_HOME}/nvidia"
+export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
+export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
+export LESSHISTFILE="${XDG_STATE_HOME}/less/history"
+export PASSWORD_STORE_DIR="${XDG_DATA_HOME}/pass"
+export MBSYNCRC="${XDG_CONFIG_HOME}/isync/mbsyncrc"
 
 # etc
 export PATH="${PATH}:${HOME}/.local/bin:${HOME}/.local/bin/sb:${HOME}/.local/bin/sds"
-- 
cgit v1.2.3