michael/dotfiles
1
0
Fork 0
mirror of https://github.com/m-housh/dotfiles.git synced 2026-02-13 22:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Updates logging paths, to all write to 'logs' directory in the tmp directory.

Browse Source
This commit is contained in:
Michael Housh
2025-10-09 18:36:49 -04:00
parent 0bb288b3d6
commit e003be5bee
23 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
env/.local/scripts/hypr/install-webapp vendored
View File

@@ -237,7 +237,7 @@ EOF
# Setup logging file and label # Setup logging file and label
source "$SCRIPTS/hypr/logging" source "$SCRIPTS/hypr/logging"
setup-logging "/tmp/$THIS.log" "$THIS" setup-logging "$THIS.log" "$THIS"
export LOG_ENABLE_DRY_RUN="$dry_run" export LOG_ENABLE_DRY_RUN="$dry_run"
if [[ -z "$XDG_DATA_HOME" ]]; then if [[ -z "$XDG_DATA_HOME" ]]; then

2
env/.local/scripts/hypr/launch vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=$(basename "$THIS_FILE") THIS=$(basename "$THIS_FILE")
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
usage() { usage() {
cat <<EOF cat <<EOF

2
env/.local/scripts/hypr/launch-webapp vendored
View File

@@ -5,7 +5,7 @@ SCRIPTS="${SCRIPTS:-$HOME/.local/scripts}"
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=$(basename "$THIS_FILE") THIS=$(basename "$THIS_FILE")
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
usage() { usage() {
cat <<EOF cat <<EOF

9
env/.local/scripts/hypr/logging vendored
View File

@@ -31,6 +31,7 @@ set -e
set -o nounset set -o nounset
set -o pipefail set -o pipefail
LOG_DIR=${LOG_DIR:-/tmp/logs}
LOG_INVOCATION_ID=${LOG_INVOCATION_ID:-""} LOG_INVOCATION_ID=${LOG_INVOCATION_ID:-""}
LOG_LABEL=${LOG_LABEL:-""} LOG_LABEL=${LOG_LABEL:-""}
# Run in dry run mode, which just prints to the console and does # Run in dry run mode, which just prints to the console and does
@@ -56,11 +57,14 @@ __msg() {
} }
__ensure_setup() { __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 -e "\e[31m[ERROR]:\e[0m Logging is not properly setup."
echo "Perhaps you didn't call 'setup-logging' first." echo "Perhaps you didn't call 'setup-logging' first."
print_logger_env && exit 1 print_logger_env && exit 1
fi fi
if [[ ! -d $LOG_DIR ]]; then
mkdir -p "$LOG_DIR"
fi
} }
logging() { logging() {
@@ -106,7 +110,7 @@ logging() {
if [[ $LOG_ENABLE_DRY_RUN == "0" ]]; then if [[ $LOG_ENABLE_DRY_RUN == "0" ]]; then
# Loop over log files logging message to each file. # Loop over log files logging message to each file.
for i in "${!LOG_FILE[@]}"; do for i in "${!LOG_FILE[@]}"; do
local file=${LOG_FILE[i]} local file=${LOG_DIR}/${LOG_FILE[i]}
local id=$LOG_INVOCATION_ID local id=$LOG_INVOCATION_ID
local label=${LOG_LABEL[i]:-"$LOG_LABEL"} local label=${LOG_LABEL[i]:-"$LOG_LABEL"}
local time=$(date '+%D %H:%M:%S') local time=$(date '+%D %H:%M:%S')
@@ -165,6 +169,7 @@ setup-logging() {
LOG_LABEL+=("$label") LOG_LABEL+=("$label")
fi fi
export LOG_DIR
export LOG_FILE export LOG_FILE
export LOG_LABEL export LOG_LABEL
export LOG_INVOCATION_ID export LOG_INVOCATION_ID

2
env/.local/scripts/hypr/monitorctl vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} 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_class="com.ghostty.$THIS"
window_padding_x="10" window_padding_x="10"

2
env/.local/scripts/hypr/uninstall-desktop-app vendored
View File

@@ -50,7 +50,7 @@ log() {
############################## MAIN ############################## ############################## MAIN ##############################
source "$SCRIPTS/hypr/logging" source "$SCRIPTS/hypr/logging"
setup-logging "/tmp/$THIS.log" "$THIS" setup-logging "$THIS.log" "$THIS"
if [[ -z $XDG_DATA_HOME ]]; then if [[ -z $XDG_DATA_HOME ]]; then
log "xdg data home is not set" log "xdg data home is not set"

2
env/.local/scripts/hypr/utils-launcher vendored
View File

@@ -8,7 +8,7 @@ FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename $THIS_FILE) LOG_LABEL=$(basename $THIS_FILE)
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-/tmp/$LOG_LABEL.log} LOG_FILE=${LOG_FILE:-$LOG_LABEL.log}
SCRIPTS=${SCRIPTS:-$HOME/.local/scripts} SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
XDG_CONFIG_HOME=${XDG_CONFIG_HOME} XDG_CONFIG_HOME=${XDG_CONFIG_HOME}

2
env/.local/scripts/hypr/utils/fzf/preview-stats vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename $THIS_FILE) LOG_LABEL=$(basename $THIS_FILE)
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-/tmp/$LOG_LABEL.log} LOG_FILE=${LOG_FILE:-$LOG_LABEL.log}
usage() { usage() {
cat <<EOF cat <<EOF

13
env/.local/scripts/hypr/utils/logs/logs-picker vendored
View File

@@ -8,7 +8,8 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} 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:-""} FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""}
# Logging utility function, use in place of echo. # Logging utility function, use in place of echo.
@@ -34,18 +35,22 @@ EOF
source "$SCRIPTS/hypr/logging" source "$SCRIPTS/hypr/logging"
setup-logging "$LOG_FILE" "$LOG_LABEL" 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. # Setup colors before calling fzf.
[[ -z $FZF_DEFAULT_OPTS ]] && [[ -z $FZF_DEFAULT_OPTS ]] &&
[[ -f $SCRIPTS/catppuccin-colors ]] && [[ -f $SCRIPTS/catppuccin-colors ]] &&
source $SCRIPTS/catppuccin-colors source $SCRIPTS/catppuccin-colors
sel=$( sel=$(
/bin/ls /tmp/*.log | /bin/ls $LOG_DIR/*.log |
sed 's#.*/##; s/\..*$//' | # cleans to only show file name, excluding the path and '.log' sed 's#.*/##; s/\..*$//' | # cleans to only show file name, excluding the path and '.log'
fzf --style=full \ fzf --style=full \
--footer="$(footer)" \ --footer="$(footer)" \
--preview-label='[ Logs ]' \ --preview-label='[ Logs ]' \
--preview='echo ""; bat /tmp/{}.log' \ --preview='echo ""; bat $LOG_DIR/{}.log' \
--preview-window="down" --preview-window="down"
) )
@@ -53,4 +58,4 @@ if [[ -z $sel ]]; then
log --error "No selection" && exit 1 log --error "No selection" && exit 1
fi fi
bat /tmp/$sel.log bat $sel.log

2
env/.local/scripts/hypr/utils/monitors/monitor-picker vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} 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:-""} FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""}
usage() { usage() {

2
env/.local/scripts/hypr/utils/monitors/monitor-toggle vendored
View File

@@ -10,7 +10,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
usage() { usage() {
cat <<EOF cat <<EOF

2
env/.local/scripts/hypr/utils/windows/close-windows vendored
View File

@@ -8,7 +8,7 @@ THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
# Allows script name to be set when called from a parent script or defaults to filename. # Allows script name to be set when called from a parent script or defaults to filename.
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-/tmp/$LOG_LABEL.log} LOG_FILE=${LOG_FILE:-$LOG_LABEL.log}
usage() { usage() {
cat <<EOF cat <<EOF

2
env/.local/scripts/hypr/utils/windows/focus-window vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
usage() { usage() {
cat <<EOF cat <<EOF

2
env/.local/scripts/hypr/utils/windows/window-action-picker vendored
View File

@@ -7,7 +7,7 @@ set -o pipefail
SCRIPTS=${SCRIPTS:-$HOME/.local/scripts} SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""} FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""}

2
env/.local/scripts/hypr/utils/windows/window-picker vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename $THIS_FILE) LOG_LABEL=$(basename $THIS_FILE)
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-/tmp/$LOG_LABEL.log} LOG_FILE=${LOG_FILE:-$LOG_LABEL.log}
uses_supplied_footer="0" uses_supplied_footer="0"
fzf_opts=() fzf_opts=()

2
env/.local/scripts/hypr/utils/windows/window-toggle-floating vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
address="" address=""
width="" width=""

2
env/.local/scripts/hypr/utils/windows/windowctl-picker vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
usage() { usage() {
cat <<EOF cat <<EOF

2
env/.local/scripts/hypr/utils/workspaces/switch-to-workspace vendored
View File

@@ -3,7 +3,7 @@
SCRIPTS=${SCRIPTS:-$HOME/.local/scripts} SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename $THIS_FILE) LOG_LABEL=$(basename $THIS_FILE)
LOG_FILE=${LOG_FILE:-/tmp/$LOG_LABEL.log} LOG_FILE=${LOG_FILE:-$LOG_LABEL.log}
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
usage() { usage() {

2
env/.local/scripts/hypr/utils/workspaces/workspace-picker vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} 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:-""} FZF_DEFAULT_OPTS=${FZF_DEFAULT_OPTS:-""}
return_name_if_special_flag="0" return_name_if_special_flag="0"

2
env/.local/scripts/hypr/utils/workspaces/workspace-toggle vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
usage() { usage() {
cat <<EOF cat <<EOF

2
env/.local/scripts/hypr/utils/workspaces/workspacectl-launch vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
PARENT_COMMAND=${THIS// launch/} PARENT_COMMAND=${THIS// launch/}
if [[ -z PARENT_COMMAND ]]; then if [[ -z PARENT_COMMAND ]]; then
PARENT_COMMAND="workspacectl" PARENT_COMMAND="workspacectl"

2
env/.local/scripts/hypr/windowctl vendored
View File

@@ -8,7 +8,7 @@ THIS_FILE=${BASH_SOURCE[0]}
THIS=$(basename $THIS_FILE) THIS=$(basename $THIS_FILE)
LOG_LABEL=$(basename $THIS_FILE) LOG_LABEL=$(basename $THIS_FILE)
SCRIPTS=${SCRIPTS:-$HOME/.local/scripts} SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
usage() { usage() {
cat <<EOF cat <<EOF

2
env/.local/scripts/hypr/workspacectl vendored
View File

@@ -8,7 +8,7 @@ SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
THIS_FILE=${BASH_SOURCE[0]} THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename "$THIS_FILE") LOG_LABEL=$(basename "$THIS_FILE")
THIS=${THIS:-$LOG_LABEL} THIS=${THIS:-$LOG_LABEL}
LOG_FILE=${LOG_FILE:-"/tmp/$LOG_LABEL.log"} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
usage() { usage() {
cat <<EOF cat <<EOF