From 12b866aea93de30b119dc2ba99ca69cbf21dd0aa Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 15 Oct 2016 20:34:29 -0400 Subject: [PATCH] fish: Drop two patches no longer needed --- .../fish/share-functions-fish_prompt.fish.patch | 15 --------------- packages/fish/share-functions-help.fish.patch | 12 ------------ 2 files changed, 27 deletions(-) delete mode 100644 packages/fish/share-functions-fish_prompt.fish.patch delete mode 100644 packages/fish/share-functions-help.fish.patch diff --git a/packages/fish/share-functions-fish_prompt.fish.patch b/packages/fish/share-functions-fish_prompt.fish.patch deleted file mode 100644 index 000cb36cd..000000000 --- a/packages/fish/share-functions-fish_prompt.fish.patch +++ /dev/null @@ -1,15 +0,0 @@ -Avoid calling 'hostname' which may not exist (and will probably -return "localhost" anyway"). - -diff -u -r ../fish-shell-master/share/functions/fish_prompt.fish ./share/functions/fish_prompt.fish ---- ../fish-shell-master/share/functions/fish_prompt.fish 2016-03-12 15:26:01.000000000 -0500 -+++ ./share/functions/fish_prompt.fish 2016-03-13 17:49:30.550445275 -0400 -@@ -5,7 +5,7 @@ - function fish_prompt --description "Write out the prompt" - # Just calculate this once, to save a few cycles when displaying the prompt - if not set -q __fish_prompt_hostname -- set -g __fish_prompt_hostname (hostname|cut -d . -f 1) -+ set -g __fish_prompt_hostname "localhost" - end - - set -l color_cwd diff --git a/packages/fish/share-functions-help.fish.patch b/packages/fish/share-functions-help.fish.patch deleted file mode 100644 index 2e63a34b4..000000000 --- a/packages/fish/share-functions-help.fish.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../fish-shell-master/share/functions/help.fish ./share/functions/help.fish ---- ../fish-shell-master/share/functions/help.fish 2016-03-12 15:26:01.000000000 -0500 -+++ ./share/functions/help.fish 2016-03-14 12:08:13.804718800 -0400 -@@ -125,7 +125,7 @@ - end - else - # Go to the web. Only include one dot in the version string -- set -l version_string (echo $FISH_VERSION| cut -d . -f 1,2) -+ set -l version_string current # Termux: We're building from git master for now. - set page_url http://fishshell.com/docs/$version_string/$fish_help_page - end -