fix: smarter AWK detection that supports nawk

This commit is contained in:
Stephen M. Coakley 2018-01-02 11:26:20 -06:00
parent 5943c22650
commit 7592f43dea
No known key found for this signature in database
GPG Key ID: 91B59C18494C4FC0
4 changed files with 11 additions and 6 deletions

View File

@ -25,7 +25,7 @@ before_script:
- tree -h - tree -h
- export - export
- pushd bin; sha256sum -c install.sha256; popd - pushd bin; sha256sum -c install.sha256; popd
- fish $TRAVIS_BUILD_DIR/bin/install --offline --noninteractive --yes - fish $TRAVIS_BUILD_DIR/bin/install --verbose --offline --noninteractive --yes
script: script:
- tests/run.fish - tests/run.fish

View File

@ -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):
``` ```
bedbff763e374d5ca3367fa75b322302411e961947133eb22c7115083ba3a3ff install 4dd63d6a974a61c100cbe145ae46eac69edce985f20b061f353cc399b36c7587 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]:

View File

@ -466,8 +466,9 @@ function sane_environment_check
and test "$result[3]" = 1.2.3 and test "$result[3]" = 1.2.3
or abort (which sort)" is not a sane 'sort' implementation" or abort (which sort)" is not a sane 'sort' implementation"
debug "Checking AWK version" debug "Checking for a working AWK interpreter"
if not cmd awk -Wv | cmd grep -i -q AWK cmd awk 'BEGIN{exit 42;}' < /dev/null ^ /dev/null
if not test $status -eq 42
abort (which awk)" does not look like an AWK interpreter." abort (which awk)" does not look like an AWK interpreter."
end end
@ -581,7 +582,11 @@ end
# A link-following `which` wrapper. # A link-following `which` wrapper.
function which function which
command readlink (command which $argv) if type -q realpath
realpath (command which $argv)
else
command readlink (command which $argv)
end
end end

View File

@ -1 +1 @@
bedbff763e374d5ca3367fa75b322302411e961947133eb22c7115083ba3a3ff install 4dd63d6a974a61c100cbe145ae46eac69edce985f20b061f353cc399b36c7587 install