From 4d8d6aa6b99b3859b33300f185e41ae252a202d5 Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Sat, 9 Apr 2016 11:33:58 +0900 Subject: [PATCH 1/6] No overriding getopts via plugins. Close #191 --- functions/__fisher_plugin_walk.fish | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/functions/__fisher_plugin_walk.fish b/functions/__fisher_plugin_walk.fish index aee5b2e..b6bd661 100644 --- a/functions/__fisher_plugin_walk.fish +++ b/functions/__fisher_plugin_walk.fish @@ -5,6 +5,10 @@ function __fisher_plugin_walk -a plugin path set -l name (basename $file .fish) set -l base $name.fish + if test "$name" = "getopts" + continue # See #191 + end + debug "file %s" $file switch $file From 1fce5e37ff9a56c7e087e277673544223d7a51fb Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Sat, 9 Apr 2016 11:34:15 +0900 Subject: [PATCH 2/6] Experiment with screencast first on top. --- README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 52f49e1..7ae3a62 100644 --- a/README.md +++ b/README.md @@ -3,23 +3,16 @@ [![Slack Room][slack-badge]][slack-link] - +[![play]][play-link]

-
-
-

Fisherman
-

-[![play]][play-link] - - ## Install ```fish From ccfc40afe16b8a750ad63fae31e85a0cae0aab6e Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Sat, 9 Apr 2016 11:36:45 +0900 Subject: [PATCH 3/6] Move badges above install notice. --- README.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7ae3a62..f92719c 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,20 @@ -[![Build Status][travis-badge]][travis-link] -[![Fisherman Version][version-badge]][version-link] -[![Slack Room][slack-badge]][slack-link] - [![play]][play-link] -

+

+

Fisherman
-

+
+
+ + +[![Build Status][travis-badge]][travis-link] +[![Fisherman Version][version-badge]][version-link] +[![Slack Room][slack-badge]][slack-link] ## Install @@ -250,3 +253,6 @@ git push origin master [other]: https://github.com/fisherman/fisherman/wiki/Installing-Fisherman#notes [Fisherman]: http://fisherman.sh [new]: https://github.com/fishery/new + + +:anchor: From 51558263e7cd45dc1a3d44c2599dbc79153b5ec2 Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Sat, 9 Apr 2016 11:41:15 +0900 Subject: [PATCH 4/6] Remove anchor and make logo larger. --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index f92719c..84418c5 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@
Fisherman

@@ -253,6 +253,3 @@ git push origin master [other]: https://github.com/fisherman/fisherman/wiki/Installing-Fisherman#notes [Fisherman]: http://fisherman.sh [new]: https://github.com/fishery/new - - -:anchor: From 93eaec7240045ad02f1126e0097f7fe3dc2fa8d5 Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Sat, 9 Apr 2016 12:47:37 +0900 Subject: [PATCH 5/6] Add new demo thumbnail. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84418c5..26efe46 100644 --- a/README.md +++ b/README.md @@ -243,7 +243,7 @@ git push origin master [slack-link]: https://fisherman-wharf.herokuapp.com/ [slack-badge]: https://img.shields.io/badge/slack-join%20the%20chat-00B9FF.svg?style=flat-square -[play]: https://cloud.githubusercontent.com/assets/8317250/13458315/dfcac4b4-e0af-11e5-8ee5-df31d1cdf409.png +[play]: https://cloud.githubusercontent.com/assets/8317250/14401577/14411b12-fe51-11e5-8d5a-bb054edfc2d4.png [play-link]: http://fisherman.sh/#demo [Get Started]: https://github.com/fisherman/fisherman/wiki From bb54fa267c499fd00cf4324f654e580ebd7dad9d Mon Sep 17 00:00:00 2001 From: detailyang Date: Mon, 11 Apr 2016 10:48:18 +0800 Subject: [PATCH 6/6] Use ``test -L`` and ``-e`` to check whether file exists. Close #182. Possibly fix #182. --- functions/__fisher_plugin_fetch.fish | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/functions/__fisher_plugin_fetch.fish b/functions/__fisher_plugin_fetch.fish index 685bd48..388f06d 100644 --- a/functions/__fisher_plugin_fetch.fish +++ b/functions/__fisher_plugin_fetch.fish @@ -71,7 +71,16 @@ function -S __fisher_plugin_fetch printf "%s\n" "$name" debug "plugin %s" "$name" - if test ! -e $path + if test ! -e "$path" + if test -L "$path" + set -l realpath (command readlink "$path") + if __fisher_file_remove "$realpath" "$fisher_file" + debug "Remove broken plugin %s(%s) ok" "$name" "$realpath" + else + debug "Remove broken plugin %s(%s) fail" "$name" "$realpath" + end + end + if not set -q __fisher_fetch_status set -g __fisher_fetch_status printf "Installing plugin/s\n" > $stderr