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

fix: Fixes webapp script logging errors.

Browse Source
This commit is contained in:
Michael Housh
2025-11-09 13:57:02 -05:00
parent 6b13291fff
commit 307a971371
1 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
webapp
View File

@@ -3,16 +3,26 @@
# Installs or uninstalls webapps based on the spec in the './webapps' directory. # Installs or uninstalls webapps based on the spec in the './webapps' directory.
# #
# This is used when setting up a new machine. # This is used when setting up a new machine.
#
set -e
set -o nounset
set -o pipefail
THIS_FILE=${BASH_SOURCE[0]}
LOG_LABEL=$(basename $THIS_FILE)
SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
if [ -z "$DEV_ENV" ]; then if [ -z "$DEV_ENV" ]; then
echo "env var DEV_ENV needs to be present" echo "env var DEV_ENV needs to be present"
exit 1 exit 1
fi fi
if [ -z "$XDG_DATA_HOME" ]; then if [ -z "$XDG_DATA_HOME" ]; then
echo "no xdg data home" echo "no xdg data home"
echo "using ~/.local/share" echo "using ~/.local/share"
XDG_DATA_HOME=~/.local/share XDG_DATA_HOME=~/.local/share
fi fi
grep="" grep=""
@@ -20,83 +30,84 @@ dry_run="0"
uninstall="0" uninstall="0"
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
echo "ARG: \"$1\"" echo "ARG: \"$1\""
# Handle a --dry or --dry-run argument # Handle a --dry or --dry-run argument
if [[ "$1" =~ ^--dry ]]; then if [[ "$1" =~ ^--dry ]]; then
dry_run="1" dry_run="1"
# Handle an --uninstall argument # Handle an --uninstall argument
elif [[ "$1" =~ ^--u ]]; then elif [[ "$1" =~ ^--u ]]; then
uninstall="1" uninstall="1"
# Handle an --install argument (default) # Handle an --install argument (default)
elif [[ ! "$1" =~ ^--i ]]; then elif [[ ! "$1" =~ ^--i ]]; then
grep="$1" grep="$1"
fi fi
shift shift
done done
log() { log() {
if [[ $dry_run == "1" ]]; then logging log --source "$THIS_FILE" "$@"
echo "[DRY_RUN]: $1"
else
echo "$1"
fi
} }
install() { install() {
local file=$DEV_ENV/env/webapps/$(basename $1) local file=$DEV_ENV/env/webapps/$(basename $1)
local script="$DEV_ENV/env/.local/scripts/hypr/install-webapp" local script="$DEV_ENV/env/.local/scripts/hypr/install-webapp"
if [[ ! -x $script ]]; then if [[ ! -x $script ]]; then
log "Failed to find install web app script." log "Failed to find install web app script."
exit 1 exit 1
fi fi
# Install local icons if needed # Install local icons if needed
mkdir -p $XDG_DATA_HOME/applications/icons mkdir -p $XDG_DATA_HOME/applications/icons
for i in $(find $DEV_ENV/env/.local/share/applications/icons -mindepth 1 -maxdepth 1 -type f); do for i in $(find $DEV_ENV/env/.local/share/applications/icons -mindepth 1 -maxdepth 1 -type f); do
if [[ ! -f $XDG_DATA_HOME/applications/icons/$i ]] && [[ $dry_run == "0" ]]; then if [[ ! -f $XDG_DATA_HOME/applications/icons/$i ]] && [[ $dry_run == "0" ]]; then
cp $i $XDG_DATA_HOME/applications/icons cp $i $XDG_DATA_HOME/applications/icons
fi fi
done done
log "Installing webapp from spec: $file" log "Installing webapp from spec: $file"
if [[ $dry_run == "0" ]]; then if [[ $dry_run == "0" ]]; then
$script --file $file --no-interactive $script --file $file --no-interactive
fi fi
} }
uninstall() { uninstall() {
local file=$DEV_ENV/env/webapps/$(basename $1) local file=$DEV_ENV/env/webapps/$(basename $1)
local script="$DEV_ENV/env/.local/scripts/hypr/uninstall-desktop-app" local script="$DEV_ENV/env/.local/scripts/hypr/uninstall-desktop-app"
if [[ ! -x $script ]]; then if [[ ! -x $script ]]; then
log "Failed to find uninstall web app script." log "Failed to find uninstall web app script."
exit 1 exit 1
fi fi
log "Uninstalling webapp from spec: $file" log "Uninstalling webapp from spec: $file"
if [[ $dry_run == "0" ]]; then if [[ $dry_run == "0" ]]; then
$script --file $file $script --file $file
fi fi
} }
############################## MAIN ############################## ############################## MAIN ##############################
# Setup logging file and label.
source "$SCRIPTS/hypr/logging"
setup-logging "$LOG_FILE" "$LOG_LABEL"
export LOG_ENABLE_DRY_RUN="$dry_run"
log "WEBAPP: -- grep: $grep" log "WEBAPP: -- grep: $grep"
apps_dir=$(find $DEV_ENV/env/webapps -mindepth 1 -maxdepth 1 -type f) apps_dir=$(find $DEV_ENV/env/webapps -mindepth 1 -maxdepth 1 -type f)
for s in $apps_dir; do for s in $apps_dir; do
if basename $s | grep -vq "$grep"; then if basename $s | grep -vq "$grep"; then
log "grep \"$grep\" filtered out $s" log "grep \"$grep\" filtered out $s"
continue continue
fi fi
if [[ $uninstall == "1" ]]; then if [[ $uninstall == "1" ]]; then
uninstall $s uninstall $s
else else
install $s install $s
fi fi
done done