diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-02-24 14:30:56 +1100 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-02-24 14:30:56 +1100 |
| commit | 06ace6a6ac43682d8cbd4f8ad2ae56f4237b3f95 (patch) | |
| tree | 0f7ec2b0e33cd451e2e8431a29b164486671f088 | |
| parent | install: gtk set theme (diff) | |
| download | caelestia-cli-06ace6a6ac43682d8cbd4f8ad2ae56f4237b3f95.tar.gz caelestia-cli-06ace6a6ac43682d8cbd4f8ad2ae56f4237b3f95.tar.bz2 caelestia-cli-06ace6a6ac43682d8cbd4f8ad2ae56f4237b3f95.zip | |
install: several fixes
Fix gtk + links
| -rwxr-xr-x | install/fish.fish | 1 | ||||
| -rwxr-xr-x | install/gtk.fish | 2 | ||||
| -rwxr-xr-x | install/scripts.fish | 1 | ||||
| -rw-r--r-- | install/util.fish | 3 | ||||
| -rw-r--r-- | util.fish | 4 |
5 files changed, 7 insertions, 4 deletions
diff --git a/install/fish.fish b/install/fish.fish index ca1d186..c340f62 100755 --- a/install/fish.fish +++ b/install/fish.fish @@ -13,7 +13,6 @@ update-repo fish $dist install-link $dist/config.fish $CONFIG/fish/config.fish # Install fish greeting -mkdir -p $CONFIG/fish/functions install-link $dist/fish_greeting.fish $CONFIG/fish/functions/fish_greeting.fish # Install starship config diff --git a/install/gtk.fish b/install/gtk.fish index b0a2ec6..b4e8f0a 100755 --- a/install/gtk.fish +++ b/install/gtk.fish @@ -16,7 +16,7 @@ setup-systemd-monitor gtk $dist # Set theme gsettings set org.gnome.desktop.interface gtk-theme \'adw-gtk3-dark\' if pacman -Q papirus-icon-theme &> /dev/null - read -l -p "Set icon theme to Papirus-Dark? [Y/n] ' -n" confirm + read -l -p "input 'Set icon theme to Papirus-Dark? [Y/n] ' -n" confirm test "$confirm" = 'n' -o "$confirm" = 'N' || gsettings set org.gnome.desktop.interface icon-theme \'Papirus-Dark\' end diff --git a/install/scripts.fish b/install/scripts.fish index a509a43..5997d61 100755 --- a/install/scripts.fish +++ b/install/scripts.fish @@ -11,7 +11,6 @@ set -l dist $C_DATA/scripts update-repo scripts $dist # Install to path -mkdir -p ~/.local/bin install-link $dist/main.fish ~/.local/bin/caelestia # Install completions diff --git a/install/util.fish b/install/util.fish index d9a02f5..ad5a95a 100644 --- a/install/util.fish +++ b/install/util.fish @@ -110,7 +110,8 @@ WantedBy=default.target" > $systemd/$module-monitor-scheme.path end function install-link -a from to - if ! test -L $to -a (realpath $to) = (realpath $from) + if ! test -L $to -a "$(realpath $to 2> /dev/null)" = $from + mkdir -p (dirname $to) confirm-overwrite $to ln -s $from $to end @@ -26,3 +26,7 @@ set -q XDG_DATA_HOME && set C_DATA $XDG_DATA_HOME/caelestia || set C_DATA $HOME/ set -q XDG_STATE_HOME && set C_STATE $XDG_STATE_HOME/caelestia || set C_STATE $HOME/.local/state/caelestia set -q XDG_CACHE_HOME && set C_CACHE $XDG_CACHE_HOME/caelestia || set C_CACHE $HOME/.cache/caelestia set -q XDG_CONFIG_HOME && set CONFIG $XDG_CONFIG_HOME || set CONFIG $HOME/.config + +mkdir -p $C_DATA +mkdir -p $C_STATE +mkdir -p $C_CACHE |