From 06ace6a6ac43682d8cbd4f8ad2ae56f4237b3f95 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Mon, 24 Feb 2025 14:30:56 +1100
Subject: install: several fixes

Fix gtk + links
---
 install/fish.fish    | 1 -
 install/gtk.fish     | 2 +-
 install/scripts.fish | 1 -
 install/util.fish    | 3 ++-
 4 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'install')

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
-- 
cgit v1.2.3-freya