From 00236e5af369631a8d5aff64a4bdaaa82efd54ed Mon Sep 17 00:00:00 2001 From: Bruno Pinto Date: Wed, 20 Nov 2013 07:53:39 -0200 Subject: [PATCH] tidying --- plugins/django/djtest.fish | 1 - plugins/emoji-clock/emoji-clock.fish | 120 +++++++++++----------- plugins/gi/gi.load | 19 ++-- plugins/php/phphttp.fish | 144 +++++++++++++-------------- 4 files changed, 141 insertions(+), 143 deletions(-) diff --git a/plugins/django/djtest.fish b/plugins/django/djtest.fish index 9726130..ad07f23 100644 --- a/plugins/django/djtest.fish +++ b/plugins/django/djtest.fish @@ -9,5 +9,4 @@ function djtest else time python manage.py test $VERBOSE end - end diff --git a/plugins/emoji-clock/emoji-clock.fish b/plugins/emoji-clock/emoji-clock.fish index b41113f..05f7bc3 100644 --- a/plugins/emoji-clock/emoji-clock.fish +++ b/plugins/emoji-clock/emoji-clock.fish @@ -12,77 +12,77 @@ function emoji-clock set minutes (date '+%M') switch $hour case 01 - if test $minutes -ge 30 - set clock "🕜" - else - set clock "🕐" - end + if test $minutes -ge 30 + set clock "🕜" + else + set clock "🕐" + end case 02 - if test $minutes -ge 30 - set clock "🕝" - else - set clock "🕑" - end + if test $minutes -ge 30 + set clock "🕝" + else + set clock "🕑" + end case 03 - if test $minutes -ge 30 - set clock "🕞" - else - set clock "🕒" - end + if test $minutes -ge 30 + set clock "🕞" + else + set clock "🕒" + end case 04 - if test $minutes -ge 30 - set clock "🕟" - else - set clock "🕓" - end + if test $minutes -ge 30 + set clock "🕟" + else + set clock "🕓" + end case 05 - if test $minutes -ge 30 - set clock "🕠" - else - set clock "🕔" - end + if test $minutes -ge 30 + set clock "🕠" + else + set clock "🕔" + end case 06 - if test $minutes -ge 30 - set clock "🕡" - else - set clock "🕕" - end + if test $minutes -ge 30 + set clock "🕡" + else + set clock "🕕" + end case 07 - if test $minutes -ge 30 - set clock "🕢" - else - set clock "🕖" - end + if test $minutes -ge 30 + set clock "🕢" + else + set clock "🕖" + end case 08 - if test $minutes -ge 30 - set clock "🕣" - else - set clock "🕗" - end + if test $minutes -ge 30 + set clock "🕣" + else + set clock "🕗" + end case 09 - if test $minutes -ge 30 - set clock "🕤" - else - set clock "🕘" - end + if test $minutes -ge 30 + set clock "🕤" + else + set clock "🕘" + end case 10 - if test $minutes -ge 30 - set clock "🕥" - else - set clock "🕙" - end + if test $minutes -ge 30 + set clock "🕥" + else + set clock "🕙" + end case 11 - if test $minutes -ge 30 - set clock "🕦" - else - set clock "🕚" - end + if test $minutes -ge 30 + set clock "🕦" + else + set clock "🕚" + end case 12 - if test $minutes -ge 30 - set clock "🕧" - else - set clock "🕛" - end + if test $minutes -ge 30 + set clock "🕧" + else + set clock "🕛" + end case '*' set clock "⌛" end echo $clock diff --git a/plugins/gi/gi.load b/plugins/gi/gi.load index 0fa64ff..62d0784 100644 --- a/plugins/gi/gi.load +++ b/plugins/gi/gi.load @@ -1,20 +1,19 @@ # gitignore.io cli for fish -# function gi #curl http://gitignore.io/api/$argv - set -l params (echo $argv|tr ' ' ',') - curl http://gitignore.io/api/$params + set -l params (echo $argv|tr ' ' ',') + curl http://gitignore.io/api/$params end # enable the complation by invoking `gi list` if not set -q -g gi_list - timeout 2 ping -c 1 -q gitignore.io >/dev/null - set gi_available $status - - if test $gi_available - set -g gi_list (gi list| tr ',' ' ' ^/dev/null) - end + timeout 2 ping -c 1 -q gitignore.io >/dev/null + set gi_available $status + + if test $gi_available + set -g gi_list (gi list| tr ',' ' ' ^/dev/null) + end end -complete -c gi -a "$gi_list" \ No newline at end of file +complete -c gi -a "$gi_list" diff --git a/plugins/php/phphttp.fish b/plugins/php/phphttp.fish index 21cbed2..bdf4a1d 100644 --- a/plugins/php/phphttp.fish +++ b/plugins/php/phphttp.fish @@ -1,87 +1,87 @@ # PHP HTTP server. function phphttp - set -l port 8000 - set -l path - set -l host 127.0.0.1 + set -l port 8000 + set -l path + set -l host 127.0.0.1 - # Ignore argument for slice. - set argv $argv ignore + # Ignore argument for slice. + set argv $argv ignore - # Process options. I think that fish should have some builtin for - # option parsing, but it doesn't. - while count $argv > /dev/null - set -l option $argv[1] + # Process options. I think that fish should have some builtin for + # option parsing, but it doesn't. + while count $argv > /dev/null + set -l option $argv[1] - switch $option - # When two hyphens appear, stop processing, while removing - # hyphens from $argv. - case -- - set argv $argv[2..-1] - break + switch $option + # When two hyphens appear, stop processing, while removing + # hyphens from $argv. + case -- + set argv $argv[2..-1] + break - # Public mode. - case -p\* --p --pu --pub --publ --publi --public p public - if test $host = 0 - echo phphttp: Duplicate option --public >&2 - end - set host 0 + # Public mode. + case -p\* --p --pu --pub --publ --publi --public p public + if test $host = 0 + echo phphttp: Duplicate option --public >&2 + end + set host 0 - # Help. - case -h\* --h --he --hel --help '-\?' h help - echo 'phphttp [--public] ' - return + # Help. + case -h\* --h --he --hel --help '-\?' h help + echo 'phphttp [--public] ' + return - # Anything else stops processing. - case \* - break - end - - # Check if the option was one letter. - switch $option - case --\* - # Doesn't count as single option - - case -\?\?\* - set argv[1] -(expr substr $argv[1] 3 length $argv[1]) - continue - end - - set argv $argv[2..-1] + # Anything else stops processing. + case \* + break end - if test (count $argv[1..-1]) -ge 4 - echo 'phphttp: Expected up to two arguments, got '(math (count $argv) - 1)'.' >&2 + # Check if the option was one letter. + switch $option + case --\* + # Doesn't count as single option + + case -\?\?\* + set argv[1] -(expr substr $argv[1] 3 length $argv[1]) + continue + end + + set argv $argv[2..-1] + end + + if test (count $argv[1..-1]) -ge 4 + echo 'phphttp: Expected up to two arguments, got '(math (count $argv) - 1)'.' >&2 + return + end + + # argv is bigger by 1 because of "ignore" argument. + if test (count $argv) -ge 2 + # Check legality of first argument + switch $argv[1] + # Fine values + case {0,1,2,3,4,5,6,7,8,9}\* + # Do nothing + + case \* + # The dev team thinks of everything. Or something. + if test -d $argv[1] + if test (count $argv) -eq 2 + echo "phphttp: directory specified without port." >&2 + else + echo "phphttp: swapped directory and port arguments." >&2 + end return + else + echo "phphttp: $argv[1] is not a port." >&2 + return + end end - # argv is bigger by 1 because of "ignore" argument. - if test (count $argv) -ge 2 - # Check legality of first argument - switch $argv[1] - # Fine values - case {0,1,2,3,4,5,6,7,8,9}\* - # Do nothing + set port $argv[1] + end + if test (count $argv) -eq 3 + set path -t$argv[2] + end - case \* - # The dev team thinks of everything. Or something. - if test -d $argv[1] - if test (count $argv) -eq 2 - echo "phphttp: directory specified without port." >&2 - else - echo "phphttp: swapped directory and port arguments." >&2 - end - return - else - echo "phphttp: $argv[1] is not a port." >&2 - return - end - end - - set port $argv[1] - end - if test (count $argv) -eq 3 - set path -t$argv[2] - end - - php -S$host:$port $path + php -S$host:$port $path end