From 4f4109784dcbe560f986a24d0828c901c1e97ace Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Sun, 2 Mar 2025 22:38:36 +1100 Subject: install: better discord install + fix broken links Take any number of inputs Hardcode some custom clients For some reason test -e doesnt count broken links as existing idk why --- install/discord.fish | 16 ++++++++-------- install/util.fish | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/install/discord.fish b/install/discord.fish index 22bf936..39f2549 100755 --- a/install/discord.fish +++ b/install/discord.fish @@ -1,16 +1,10 @@ #!/bin/fish -if test -z "$argv[1]" - echo 'Usage: caelestia install discord ' - exit 1 -end - . (dirname (status filename))/util.fish install-deps git install-optional-deps 'arrpc (rich presence)' -set -l client $CONFIG/$argv[1] set -l dist $C_DATA/discord # Update/Clone repo @@ -19,7 +13,13 @@ update-repo discord $dist # Install systemd service setup-systemd-monitor discord $dist -# Link themes to client config -install-link $dist/themes $client/themes +# Link themes to client configs +set -l clients discord vesktop equibop legcord $argv +for client in $clients + if test -d $CONFIG/$client + log "Linking themes for $client" + install-link $dist/themes $CONFIG/$client/themes + end +end log 'Done.' diff --git a/install/util.fish b/install/util.fish index ad5a95a..1d1a6ec 100644 --- a/install/util.fish +++ b/install/util.fish @@ -1,8 +1,8 @@ . (dirname (status filename))/../util.fish function confirm-overwrite -a path - if test -e $path - read -l -p "input '$(realpath $path) already exists. Overwrite? [y/N] ' -n" confirm + if test -e $path -o -L $path + read -l -p "input '$(realpath $path 2> /dev/null || echo $path) already exists. Overwrite? [y/N] ' -n" confirm if test "$confirm" = 'y' -o "$confirm" = 'Y' log 'Continuing.' test -z "$argv[2]" && rm -rf $path # If a second arg is provided, don't delete -- cgit v1.2.3-freya