Commit 112fb3db authored by Stephen M. Coakley's avatar Stephen M. Coakley Committed by GitHub

Merge pull request #603 from oh-my-fish/fix/installer-old-fish-messages

use path queries compatible with old fish
parents a845d194 ce38c3d4
...@@ -34,7 +34,7 @@ fish install --path=~/.local/share/omf --config=~/.config/omf ...@@ -34,7 +34,7 @@ fish install --path=~/.local/share/omf --config=~/.config/omf
You can verify the integrity of the downloaded installer by verifying the script against [this checksum](bin/install.sha256): You can verify the integrity of the downloaded installer by verifying the script against [this checksum](bin/install.sha256):
``` ```
4dd63d6a974a61c100cbe145ae46eac69edce985f20b061f353cc399b36c7587 install 06844ca6876fac0ea949c8089d8c5f71e14b69d2bb1dc41f1d0677250a1c62e1 install
``` ```
You can also install Oh My Fish with Git or with an offline source tarball downloaded from the [releases page][releases]: You can also install Oh My Fish with Git or with an offline source tarball downloaded from the [releases page][releases]:
......
...@@ -501,7 +501,7 @@ end ...@@ -501,7 +501,7 @@ end
# Gets the version of Git installed. # Gets the version of Git installed.
function get_git_version function get_git_version
type -f -q git type -f git > /dev/null ^ /dev/null
and command git --version | command cut -d' ' -f3 and command git --version | command cut -d' ' -f3
end end
...@@ -561,7 +561,7 @@ function assert_cmds ...@@ -561,7 +561,7 @@ function assert_cmds
set -l cmds awk basename cp cut date dirname env fish fold head mkdir mv readlink rm sed sort tar tr which set -l cmds awk basename cp cut date dirname env fish fold head mkdir mv readlink rm sed sort tar tr which
for cmd in $cmds for cmd in $cmds
type -f -q $cmd type -f $cmd > /dev/null ^ /dev/null
or abort "Missing required command: $cmd" or abort "Missing required command: $cmd"
debug "Command '$cmd' is "(which $cmd) debug "Command '$cmd' is "(which $cmd)
...@@ -582,7 +582,7 @@ end ...@@ -582,7 +582,7 @@ end
# A link-following `which` wrapper. # A link-following `which` wrapper.
function which function which
if type -q realpath if type realpath > /dev/null ^ /dev/null
realpath (command which $argv) realpath (command which $argv)
else else
command readlink (command which $argv) command readlink (command which $argv)
......
4dd63d6a974a61c100cbe145ae46eac69edce985f20b061f353cc399b36c7587 install 06844ca6876fac0ea949c8089d8c5f71e14b69d2bb1dc41f1d0677250a1c62e1 install
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment