Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 13:08:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mac OS X doesn't support uname -o. Use uname instead.

Browse source 
I break compatibility with Mac OS X again, that I don't have access
to. Result: Stuff break, and I have to fix it, so it will perhaps
work. At least, I hope it will work.
This commit is contained in:
Konrad Borowski 2013-08-16 20:47:04 +02:00
parent ca8e4c08a7
commit 3e115b7a85
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
share/functions/__fish_pwd.fish
View file

@ -1,8 +1,9 @@
if test (uname -o) = Cygwin switch (uname)
case 'CYGWIN_*'
function __fish_pwd --description "Show current path" function __fish_pwd --description "Show current path"
pwd | sed -e 's-^/cygdrive/\(.\)/\?-\u\1:/-' pwd | sed -e 's-^/cygdrive/\(.\)/\?-\u\1:/-'
end end
else case '*'
function __fish_pwd --description "Show current path" function __fish_pwd --description "Show current path"
pwd pwd
end end

4
share/functions/hostname.fish
View file

@ -1,5 +1,7 @@
# Query for USERDOMAIN to shorten waiting times when OS isn't Windows. # Query for USERDOMAIN to shorten waiting times when OS isn't Windows.
if set -q USERDOMAIN; and test (uname -o) = Cygwin set -q USERDOMAIN
and switch (uname)
case 'CYGWIN_*'
# Cygwin's hostname is broken when computer name contains Unicode # Cygwin's hostname is broken when computer name contains Unicode
# characters. This hack "fixes" hostname in Cygwin. # characters. This hack "fixes" hostname in Cygwin.
function hostname --description "Show or set the system's host name" function hostname --description "Show or set the system's host name"

7
share/functions/prompt_pwd.fish
View file

@ -1,12 +1,13 @@
if test (uname) = Darwin switch (uname)
case Darwin
function prompt_pwd --description "Print the current working directory, shortend to fit the prompt" function prompt_pwd --description "Print the current working directory, shortend to fit the prompt"
echo $PWD | sed -e "s|^$HOME|~|" -e 's|^/private||' -e 's-\([^/.]\)[^/]*/-\1/-g' echo $PWD | sed -e "s|^$HOME|~|" -e 's|^/private||' -e 's-\([^/.]\)[^/]*/-\1/-g'
end end
else if test (uname -o) = Cygwin case 'CYGWIN_*'
function prompt_pwd --description "Print the current working directory, shortend to fit the prompt" function prompt_pwd --description "Print the current working directory, shortend to fit the prompt"
echo $PWD | sed -e "s|^$HOME|~|" -e 's|^/cygdrive/\(.\)|\1/:|' -e 's-\([^/.]\)[^/]*/-\1/-g' -e 's-^\([^/]\)/:/\?-\u\1:/-' echo $PWD | sed -e "s|^$HOME|~|" -e 's|^/cygdrive/\(.\)|\1/:|' -e 's-\([^/.]\)[^/]*/-\1/-g' -e 's-^\([^/]\)/:/\?-\u\1:/-'
end end
else case '*'
function prompt_pwd --description "Print the current working directory, shortend to fit the prompt" function prompt_pwd --description "Print the current working directory, shortend to fit the prompt"
echo $PWD | sed -e "s|^$HOME|~|" -e 's-\([^/.]\)[^/]*/-\1/-g' echo $PWD | sed -e "s|^$HOME|~|" -e 's-\([^/.]\)[^/]*/-\1/-g'
end end