From e87ed2ee9f774c03c8c0fb97721b93e066d89460 Mon Sep 17 00:00:00 2001
From: "David Adam (zanchey)" <zanchey@ucc.gu.uwa.edu.au>
Date: Sun, 5 Oct 2014 12:25:38 +0800
Subject: [PATCH] 2.1.1
---
debian/postinst | 1 +
fish.spec.in | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/debian/postinst b/debian/postinst
index e7e205b..f0c90f2 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,6 +28,7 @@ add_shell() {
case "$1" in
configure)
add_shell
+ killall fishd || true
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/fish.spec.in b/fish.spec.in
index 28a8d0c..b5c299e 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
if ! grep %{_bindir}/fish %{_sysconfdir}/shells >/dev/null; then
echo %{_bindir}/fish >>%{_sysconfdir}/shells
fi
+# Restart fishd if upgrading
+if [ "$1" -gt 1 ]; then
+ killall fishd
+fi
%postun
# Remove fish from the list of allowed shells in /etc/shells
--
GitLab