From 160f7faafa190db8dafd5e11a9d57529f0adb721 Mon Sep 17 00:00:00 2001 From: Yaroslav Sidlovsky Date: Sep 23 2022 11:05:33 +0000 Subject: Fixed KITTY_INSTALLATION_DIR in scripts --- diff --git a/kitty.fish b/kitty.fish index fa97a00..4d7da78 100644 --- a/kitty.fish +++ b/kitty.fish @@ -1,4 +1,4 @@ -set -l KITTY_INSTALLATION_DIR "/usr/lib64/kitty" +set -l KITTY_INSTALLATION_DIR "/usr/lib/kitty" if test -n "$KITTY_PID" if test -f "$KITTY_INSTALLATION_DIR"/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish set --global KITTY_SHELL_INTEGRATION enabled diff --git a/kitty.sh b/kitty.sh index 8b54296..fe4b396 100644 --- a/kitty.sh +++ b/kitty.sh @@ -1,4 +1,4 @@ -KITTY_INSTALLATION_DIR="/usr/lib64/kitty" +KITTY_INSTALLATION_DIR="/usr/lib/kitty" if [[ -n "${BASH_VERSION}" && -n "${KITTY_PID}" ]]; then if [[ -f "$KITTY_INSTALLATION_DIR"/shell-integration/bash/kitty.bash ]]; then export KITTY_SHELL_INTEGRATION="enabled" diff --git a/kitty.spec b/kitty.spec index aa30a7c..4d17bab 100644 --- a/kitty.spec +++ b/kitty.spec @@ -200,8 +200,10 @@ install -m0644 -Dp %{SOURCE1} %{buildroot}%{_metainfodir}/%{name}.appdata.xml install -m0644 -Dp %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh install -m0644 -Dp %{SOURCE3} %{buildroot}%{_sysconfdir}/fish/conf.d/%{name}.fish -sed "s|/usr/lib64/kitty|%{_libdir}/%{name}|" -i %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh -sed "s|/usr/lib64/kitty|%{_libdir}/%{name}|" -i %{buildroot}%{_sysconfdir}/fish/conf.d/%{name}.fish +sed 's|KITTY_INSTALLATION_DIR=.*|KITTY_INSTALLATION_DIR="%{_libdir}/%{name}"|' \ + -i %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh +sed 's|set -l KITTY_INSTALLATION_DIR .*|set -l KITTY_INSTALLATION_DIR "%{_libdir}/%{name}"|' \ + -i %{buildroot}%{_sysconfdir}/fish/conf.d/%{name}.fish # script-without-shebang '__init__.py' find %{buildroot} -type f -name "*.py*" ! -name askpass.py -exec chmod -x "{}" \;