From e003be5beef43afdb2ccf0351dccc701cadf4062 Mon Sep 17 00:00:00 2001
From: Michael Housh <michael@mhoush.com>
Date: Thu, 9 Oct 2025 18:36:49 -0400
Subject: [PATCH] feat: Updates logging paths, to all write to 'logs' directory
 in the tmp directory.

---
 env/.local/scripts/hypr/install-webapp              |  2 +-
 env/.local/scripts/hypr/launch                      |  2 +-
 env/.local/scripts/hypr/launch-webapp               |  2 +-
 env/.local/scripts/hypr/logging                     |  9 +++++++--
 env/.local/scripts/hypr/monitorctl                  |  2 +-
 env/.local/scripts/hypr/uninstall-desktop-app       |  2 +-
 env/.local/scripts/hypr/utils-launcher              |  2 +-
 env/.local/scripts/hypr/utils/fzf/preview-stats     |  2 +-
 env/.local/scripts/hypr/utils/logs/logs-picker      | 13 +++++++++----
 .../scripts/hypr/utils/monitors/monitor-picker      |  2 +-
 .../scripts/hypr/utils/monitors/monitor-toggle      |  2 +-
 env/.local/scripts/hypr/utils/windows/close-windows |  2 +-
 env/.local/scripts/hypr/utils/windows/focus-window  |  2 +-
 .../scripts/hypr/utils/windows/window-action-picker |  2 +-
 env/.local/scripts/hypr/utils/windows/window-picker |  2 +-
 .../hypr/utils/windows/window-toggle-floating       |  2 +-
 .../scripts/hypr/utils/windows/windowctl-picker     |  2 +-
 .../hypr/utils/workspaces/switch-to-workspace       |  2 +-
 .../scripts/hypr/utils/workspaces/workspace-picker  |  2 +-
 .../scripts/hypr/utils/workspaces/workspace-toggle  |  2 +-
 .../hypr/utils/workspaces/workspacectl-launch       |  2 +-
 env/.local/scripts/hypr/windowctl                   |  2 +-
 env/.local/scripts/hypr/workspacectl                |  2 +-
 23 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/env/.local/scripts/hypr/install-webapp b/env/.local/scripts/hypr/install-webapp
index 4e53a08..5418375 100755
--- a/env/.local/scripts/hypr/install-webapp
+++ b/env/.local/scripts/hypr/install-webapp
@@ -237,7 +237,7 @@ EOF
 
 # Setup logging file and label
 source "$SCRIPTS/hypr/logging"
-setup-logging "/tmp/$THIS.log" "$THIS"
+setup-logging "$THIS.log" "$THIS"
 export LOG_ENABLE_DRY_RUN="$dry_run"
 
 if [[ -z "$XDG_DATA_HOME" ]]; then
diff --git a/env/.local/scripts/hypr/launch b/env/.local/scripts/hypr/launch
index 8d7ac54..a6d1fc2 100755
--- a/env/.local/scripts/hypr/launch
+++ b/env/.local/scripts/hypr/launch
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=$(basename "$THIS_FILE")
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 
 usage() {
   cat <<EOF
diff --git a/env/.local/scripts/hypr/launch-webapp b/env/.local/scripts/hypr/launch-webapp
index 2a2750c..52d923a 100755
--- a/env/.local/scripts/hypr/launch-webapp
+++ b/env/.local/scripts/hypr/launch-webapp
@@ -5,7 +5,7 @@ SCRIPTS="${SCRIPTS:-$HOME/.local/scripts}"
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=$(basename "$THIS_FILE")
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 
 usage() {
   cat <<EOF
diff --git a/env/.local/scripts/hypr/logging b/env/.local/scripts/hypr/logging
index 45620d5..31a9355 100755
--- a/env/.local/scripts/hypr/logging
+++ b/env/.local/scripts/hypr/logging
@@ -31,6 +31,7 @@ set -e
 set -o nounset
 set -o pipefail
 
+LOG_DIR=${LOG_DIR:-/tmp/logs}
 LOG_INVOCATION_ID=${LOG_INVOCATION_ID:-""}
 LOG_LABEL=${LOG_LABEL:-""}
 # Run in dry run mode, which just prints to the console and does
@@ -56,11 +57,14 @@ __msg() {
 }
 
 __ensure_setup() {
-  if [[ -z $LOG_FILE ]] || [[ -z $LOG_INVOCATION_ID ]] || [[ -z $LOG_LABEL ]]; then
+  if [[ -z $LOG_FILE ]] || [[ -z $LOG_INVOCATION_ID ]] || [[ -z $LOG_LABEL ]] || [[ -z $LOG_DIR ]]; then
     echo -e "\e[31m[ERROR]:\e[0m Logging is not properly setup."
     echo "Perhaps you didn't call 'setup-logging' first."
     print_logger_env && exit 1
   fi
+  if [[ ! -d $LOG_DIR ]]; then
+    mkdir -p "$LOG_DIR"
+  fi
 }
 
 logging() {
@@ -106,7 +110,7 @@ logging() {
   if [[ $LOG_ENABLE_DRY_RUN == "0" ]]; then
     # Loop over log files logging message to each file.
     for i in "${!LOG_FILE[@]}"; do
-      local file=${LOG_FILE[i]}
+      local file=${LOG_DIR}/${LOG_FILE[i]}
       local id=$LOG_INVOCATION_ID
       local label=${LOG_LABEL[i]:-"$LOG_LABEL"}
       local time=$(date '+%D %H:%M:%S')
@@ -165,6 +169,7 @@ setup-logging() {
     LOG_LABEL+=("$label")
   fi
 
+  export LOG_DIR
   export LOG_FILE
   export LOG_LABEL
   export LOG_INVOCATION_ID
diff --git a/env/.local/scripts/hypr/monitorctl b/env/.local/scripts/hypr/monitorctl
index 32a8a7d..a5a9447 100755
--- a/env/.local/scripts/hypr/monitorctl
+++ b/env/.local/scripts/hypr/monitorctl
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 
 window_class="com.ghostty.$THIS"
 window_padding_x="10"
diff --git a/env/.local/scripts/hypr/uninstall-desktop-app b/env/.local/scripts/hypr/uninstall-desktop-app
index e0c622b..74293a2 100755
--- a/env/.local/scripts/hypr/uninstall-desktop-app
+++ b/env/.local/scripts/hypr/uninstall-desktop-app
@@ -50,7 +50,7 @@ log() {
 ############################## MAIN ##############################
 
 source "$SCRIPTS/hypr/logging"
-setup-logging "/tmp/$THIS.log" "$THIS"
+setup-logging "$THIS.log" "$THIS"
 
 if [[ -z $XDG_DATA_HOME ]]; then
   log "xdg data home is not set"
diff --git a/env/.local/scripts/hypr/utils-launcher b/env/.local/scripts/hypr/utils-launcher
index 0d45de9..3594c58 100755
--- a/env/.local/scripts/hypr/utils-launcher
+++ b/env/.local/scripts/hypr/utils-launcher
@@ -8,7 +8,7 @@ FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename $THIS_FILE)
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-/tmp/$LOG_LABEL.log}
+LOG_FILE=${LOG_FILE:-$LOG_LABEL.log}
 SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 XDG_CONFIG_HOME=${XDG_CONFIG_HOME}
 
diff --git a/env/.local/scripts/hypr/utils/fzf/preview-stats b/env/.local/scripts/hypr/utils/fzf/preview-stats
index 938e2dd..83c6b42 100755
--- a/env/.local/scripts/hypr/utils/fzf/preview-stats
+++ b/env/.local/scripts/hypr/utils/fzf/preview-stats
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename $THIS_FILE)
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-/tmp/$LOG_LABEL.log}
+LOG_FILE=${LOG_FILE:-$LOG_LABEL.log}
 
 usage() {
   cat <<EOF
diff --git a/env/.local/scripts/hypr/utils/logs/logs-picker b/env/.local/scripts/hypr/utils/logs/logs-picker
index b71190b..753fe07 100755
--- a/env/.local/scripts/hypr/utils/logs/logs-picker
+++ b/env/.local/scripts/hypr/utils/logs/logs-picker
@@ -8,7 +8,8 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_DIR=${LOG_DIR:=""}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""}
 
 # Logging utility function, use in place of echo.
@@ -34,18 +35,22 @@ EOF
 source "$SCRIPTS/hypr/logging"
 setup-logging "$LOG_FILE" "$LOG_LABEL"
 
+if [[ -z $LOG_DIR ]]; then
+  echo "Log directory not setup properly!" && exit 1
+fi
+
 # Setup colors before calling fzf.
 [[ -z $FZF_DEFAULT_OPTS ]] &&
   [[ -f $SCRIPTS/catppuccin-colors ]] &&
   source $SCRIPTS/catppuccin-colors
 
 sel=$(
-  /bin/ls /tmp/*.log |
+  /bin/ls $LOG_DIR/*.log |
     sed 's#.*/##; s/\..*$//' | # cleans to only show file name, excluding the path and '.log'
     fzf --style=full \
       --footer="$(footer)" \
       --preview-label='[ Logs ]' \
-      --preview='echo ""; bat /tmp/{}.log' \
+      --preview='echo ""; bat $LOG_DIR/{}.log' \
       --preview-window="down"
 )
 
@@ -53,4 +58,4 @@ if [[ -z $sel ]]; then
   log --error "No selection" && exit 1
 fi
 
-bat /tmp/$sel.log
+bat $sel.log
diff --git a/env/.local/scripts/hypr/utils/monitors/monitor-picker b/env/.local/scripts/hypr/utils/monitors/monitor-picker
index 50855c9..da58c16 100755
--- a/env/.local/scripts/hypr/utils/monitors/monitor-picker
+++ b/env/.local/scripts/hypr/utils/monitors/monitor-picker
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""}
 
 usage() {
diff --git a/env/.local/scripts/hypr/utils/monitors/monitor-toggle b/env/.local/scripts/hypr/utils/monitors/monitor-toggle
index d6f479c..64aaeb6 100755
--- a/env/.local/scripts/hypr/utils/monitors/monitor-toggle
+++ b/env/.local/scripts/hypr/utils/monitors/monitor-toggle
@@ -10,7 +10,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 
 usage() {
   cat <<EOF
diff --git a/env/.local/scripts/hypr/utils/windows/close-windows b/env/.local/scripts/hypr/utils/windows/close-windows
index cb47a18..aeffc3d 100755
--- a/env/.local/scripts/hypr/utils/windows/close-windows
+++ b/env/.local/scripts/hypr/utils/windows/close-windows
@@ -8,7 +8,7 @@ THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 # Allows script name to be set when called from a parent script or defaults to filename.
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-/tmp/$LOG_LABEL.log}
+LOG_FILE=${LOG_FILE:-$LOG_LABEL.log}
 
 usage() {
   cat <<EOF
diff --git a/env/.local/scripts/hypr/utils/windows/focus-window b/env/.local/scripts/hypr/utils/windows/focus-window
index 0e3261d..a7d2c90 100755
--- a/env/.local/scripts/hypr/utils/windows/focus-window
+++ b/env/.local/scripts/hypr/utils/windows/focus-window
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 
 usage() {
   cat <<EOF
diff --git a/env/.local/scripts/hypr/utils/windows/window-action-picker b/env/.local/scripts/hypr/utils/windows/window-action-picker
index 1a37bdb..17111a0 100755
--- a/env/.local/scripts/hypr/utils/windows/window-action-picker
+++ b/env/.local/scripts/hypr/utils/windows/window-action-picker
@@ -7,7 +7,7 @@ set -o pipefail
 SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 THIS=${THIS:-$LOG_LABEL}
 FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""}
 
diff --git a/env/.local/scripts/hypr/utils/windows/window-picker b/env/.local/scripts/hypr/utils/windows/window-picker
index 4892dc8..3342b43 100755
--- a/env/.local/scripts/hypr/utils/windows/window-picker
+++ b/env/.local/scripts/hypr/utils/windows/window-picker
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename $THIS_FILE)
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-/tmp/$LOG_LABEL.log}
+LOG_FILE=${LOG_FILE:-$LOG_LABEL.log}
 
 uses_supplied_footer="0"
 fzf_opts=()
diff --git a/env/.local/scripts/hypr/utils/windows/window-toggle-floating b/env/.local/scripts/hypr/utils/windows/window-toggle-floating
index 6bfccfe..8f79f78 100755
--- a/env/.local/scripts/hypr/utils/windows/window-toggle-floating
+++ b/env/.local/scripts/hypr/utils/windows/window-toggle-floating
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 
 address=""
 width=""
diff --git a/env/.local/scripts/hypr/utils/windows/windowctl-picker b/env/.local/scripts/hypr/utils/windows/windowctl-picker
index fb961c6..5dc3c4b 100755
--- a/env/.local/scripts/hypr/utils/windows/windowctl-picker
+++ b/env/.local/scripts/hypr/utils/windows/windowctl-picker
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 
 usage() {
   cat <<EOF
diff --git a/env/.local/scripts/hypr/utils/workspaces/switch-to-workspace b/env/.local/scripts/hypr/utils/workspaces/switch-to-workspace
index 91b4ac9..f5158c3 100755
--- a/env/.local/scripts/hypr/utils/workspaces/switch-to-workspace
+++ b/env/.local/scripts/hypr/utils/workspaces/switch-to-workspace
@@ -3,7 +3,7 @@
 SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename $THIS_FILE)
-LOG_FILE=${LOG_FILE:-/tmp/$LOG_LABEL.log}
+LOG_FILE=${LOG_FILE:-$LOG_LABEL.log}
 THIS=${THIS:-$LOG_LABEL}
 
 usage() {
diff --git a/env/.local/scripts/hypr/utils/workspaces/workspace-picker b/env/.local/scripts/hypr/utils/workspaces/workspace-picker
index b6dcca5..4bf8808 100755
--- a/env/.local/scripts/hypr/utils/workspaces/workspace-picker
+++ b/env/.local/scripts/hypr/utils/workspaces/workspace-picker
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""}
 
 return_name_if_special_flag="0"
diff --git a/env/.local/scripts/hypr/utils/workspaces/workspace-toggle b/env/.local/scripts/hypr/utils/workspaces/workspace-toggle
index 34db91c..ceff8f4 100755
--- a/env/.local/scripts/hypr/utils/workspaces/workspace-toggle
+++ b/env/.local/scripts/hypr/utils/workspaces/workspace-toggle
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 
 usage() {
   cat <<EOF
diff --git a/env/.local/scripts/hypr/utils/workspaces/workspacectl-launch b/env/.local/scripts/hypr/utils/workspaces/workspacectl-launch
index 4f8eefb..561a17f 100755
--- a/env/.local/scripts/hypr/utils/workspaces/workspacectl-launch
+++ b/env/.local/scripts/hypr/utils/workspaces/workspacectl-launch
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 PARENT_COMMAND=${THIS// launch/}
 if [[ -z PARENT_COMMAND ]]; then
   PARENT_COMMAND="workspacectl"
diff --git a/env/.local/scripts/hypr/windowctl b/env/.local/scripts/hypr/windowctl
index 452b8f4..fea5252 100755
--- a/env/.local/scripts/hypr/windowctl
+++ b/env/.local/scripts/hypr/windowctl
@@ -8,7 +8,7 @@ THIS_FILE=${BASH_SOURCE[0]}
 THIS=$(basename $THIS_FILE)
 LOG_LABEL=$(basename $THIS_FILE)
 SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 
 usage() {
   cat <<EOF
diff --git a/env/.local/scripts/hypr/workspacectl b/env/.local/scripts/hypr/workspacectl
index 4d5c447..fed96f5 100755
--- a/env/.local/scripts/hypr/workspacectl
+++ b/env/.local/scripts/hypr/workspacectl
@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 
 usage() {
   cat <<EOF