Merge aeb501de9b into fd70a2afdd

The installation script is inspired by the one of https://github.com/ivakyb/fish_ssh_agent.

Signed-off-by: Benno Bielmeier <github@bbenno.com>

README.md

@@ -24,4 +24,4 @@ fisher install danhper/fish-ssh-agent
 
 ### Manually
 
-Copy `functions` and `conf.d` to your `$__fish_config_dir` directory. That's all.
+Copy `functions` and `conf.d` to your `$__fish_config_dir` directory by executing `./install.fish`. That's all.

functions/__ssh_agent_is_started.fish

@@ -1,18 +1,9 @@
 function __ssh_agent_is_started -d "check if ssh agent is already started"
-	if test -n "$SSH_CONNECTION"
+	if begin; test -f $SSH_ENV; and test -z "$SSH_AGENT_PID"; end
-		# This is an SSH session
-		ssh-add -l > /dev/null 2>&1
-		if test $status -eq 0 -o $status -eq 1
-			# An SSH agent was forwarded
-			return 0
-		end
-	end
-
-	if begin; test -f "$SSH_ENV"; and test -z "$SSH_AGENT_PID"; end
 		source $SSH_ENV > /dev/null
 	end
 
-	if test -z "$SSH_AGENT_PID"
+	if begin; test -z "$SSH_AGENT_PID"; and test -z "$SSH_CONNECTION"; end
 		return 1
 	end
 

install.fish

@@ -0,0 +1,4 @@
+#! /bin/env fish
+set curr_dir (dirname (status --current-filename))
+cp -r "$curr_dir"/functions "$__fish_config_dir"
+cp -r "$curr_dir"/conf.d "$__fish_config_dir"