From 384cb2d735a7acf5b93bf4f271aca936420b131b Mon Sep 17 00:00:00 2001 From: David Adam Date: Thu, 26 Mar 2015 18:16:21 +0800 Subject: [PATCH] Revert "__fish_config_interactive: warn users that fishd is going away" This reverts commit ad61c3f0d6be8b7eca4a70ccd29ba7ca6565cc6c. Work on #1730. --- share/functions/__fish_config_interactive.fish | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish index dc4777701..ea71a72a5 100644 --- a/share/functions/__fish_config_interactive.fish +++ b/share/functions/__fish_config_interactive.fish @@ -119,18 +119,6 @@ function __fish_config_interactive -d "Initializations that should be performed end end end - - # Warn upgrading users that fishd has gone away - # https://github.com/fish-shell/fish-shell/issues/1730 - set -l __fishd_socket_path - if set -q XDG_RUNTIME_DIR - set __fishd_socket_path "$XDG_RUNTIME_DIR/fishd.socket" - else - set __fishd_socket_path "/tmp/fish.$USER/fishd.socket" - end - if test -S "$__fishd_socket_path" - printf (_ "One or more instances of an old version of fish is still running.\nUniversal variables will not be shared across instances and changes may be lost.\nAll running instances of old versions of fish should be restarted.\n") - end end #