44set -u
55
66# Source global defaults
7+ if [ ! -f " ${HOME} /.config/environment.d/defaults.conf" ]; then
8+ echo " Error: defaults.conf not found" >&2
9+ exit 1
10+ fi
711. " ${HOME} /.config/environment.d/defaults.conf"
812
913# Configuration
@@ -21,7 +25,7 @@ if [ -z "${DISPLAY:-}" ]; then
2125 exit 1
2226fi
2327
24- if ! command -v $BAR & > /dev/null; then
28+ if ! command -v " $BAR " & > /dev/null; then
2529 echo " Error: $BAR is not installed" >&2
2630 exit 1
2731fi
5761
5862# Terminate already running bar instances
5963if command -v killall & > /dev/null; then
60- killall -q $BAR 2> /dev/null || true
64+ killall -q " $BAR " 2> /dev/null || true
6165elif command -v pkill & > /dev/null; then
62- pkill -x $BAR 2> /dev/null || true
66+ pkill -x " $BAR " 2> /dev/null || true
6367fi
6468
6569# Wait until the processes have been shut down (with timeout)
6670shutdown_start=$( date +%s)
67- while pgrep -u " $_CACHED_UID " -x $BAR > /dev/null 2>&1 ; do
71+ while pgrep -u " $_CACHED_UID " -x " $BAR " > /dev/null 2>&1 ; do
6872 current_time=$( date +%s)
6973 elapsed=$(( current_time - shutdown_start))
7074
7175 if [ $elapsed -ge $SHUTDOWN_TIMEOUT ]; then
7276 echo " Warning: Status bar didn't shut down gracefully, forcing kill" | tee -a " $LOG_FILE "
7377 # Force kill remaining $BAR processes
7478 if command -v pkill & > /dev/null; then
75- pkill -9 -u " $_CACHED_UID " -x $BAR 2> /dev/null || true
79+ pkill -9 -u " $_CACHED_UID " -x " $BAR " 2> /dev/null || true
7680 fi
7781 sleep 0.5
7882 break
@@ -87,7 +91,7 @@ echo "---" >> "$LOG_FILE"
8791echo " [$( date ' +%Y-%m-%d %H:%M:%S' ) ] Launching $BAR ..." >> " $LOG_FILE "
8892
8993# Launch $BAR with logging (proper background handling)
90- $BAR main >> " $LOG_FILE " 2>&1 &
94+ " $BAR " main >> " $LOG_FILE " 2>&1 &
9195BAR_pid=$!
9296
9397# Brief wait to check if $BAR started successfully
0 commit comments