diff options
| author | James Mills <1290234+prologic@users.noreply.github.com> | 2020-02-04 19:28:13 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 19:28:13 +1000 |
| commit | fffc2bc1253e029c5a7e644cec2723b975312d2d (patch) | |
| tree | a19968ee07d086bc9311cb7177b28f45f9d9a152 /packaging/installer | |
| parent | 278f2db20e76dc6a3bf496c4fc33c462da5c37eb (diff) | |
Fixes static builds and nightlies (#7971)
* Fixed the shebang for building self-extracting static builds
* Fixed shellcheck errors/warnings
* Fix require_cmd() function too and redirect both stderr/stdout of command -v in conditional
Diffstat (limited to 'packaging/installer')
| -rwxr-xr-x | packaging/installer/install-required-packages.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh index 002622d88e..b0ce127de3 100755 --- a/packaging/installer/install-required-packages.sh +++ b/packaging/installer/install-required-packages.sh @@ -511,12 +511,11 @@ require_cmd() { local wanted found for wanted in "${@}"; do - if command -v "${wanted}" 2> /dev/null; then + if command -v "${wanted}" > /dev/null 2>&1; then found="$(command -v "$wanted" 2> /dev/null)" fi [ -n "${found}" ] && [ -x "${found}" ] && return 0 done - return 1 } |