From 8455133e10ee9e36541e013613f14f12d96b8a48 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Fri, 27 Jan 2023 09:56:11 +0100 Subject: .bash_utils: get rid of uname usage --- %HOME%/.bash_utils/cxx.sh | 11 +++-------- %HOME%/.bash_utils/os.sh | 5 ++--- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to '%HOME%/.bash_utils') diff --git a/%HOME%/.bash_utils/cxx.sh b/%HOME%/.bash_utils/cxx.sh index bd9885f..5ad27ca 100644 --- a/%HOME%/.bash_utils/cxx.sh +++ b/%HOME%/.bash_utils/cxx.sh @@ -5,14 +5,9 @@ # For details, see https://github.com/egor-tensin/linux-home. # Distributed under the MIT License. -_runc_os_is_cygwin() ( - set -o errexit -o nounset -o pipefail - shopt -s inherit_errexit - - local os - os="$( uname -o )" - test 'Cygwin' = "$os" -) +_runc_os_is_cygwin() { + test "$OSTYPE" = cygwin +} if _runc_os_is_cygwin; then _runc_exe_ext='.exe' diff --git a/%HOME%/.bash_utils/os.sh b/%HOME%/.bash_utils/os.sh index 7a38ec9..c20203c 100644 --- a/%HOME%/.bash_utils/os.sh +++ b/%HOME%/.bash_utils/os.sh @@ -15,9 +15,8 @@ _ARCH_ARM='Arch Linux ARM' _FEDORA='Fedora' os_detect() { - command -v uname > /dev/null \ - && [ "$( uname -o )" == "$_CYGWIN" ] \ - && _os="$_CYGWIN" \ + [ "$OSTYPE" == cygwin ] \ + && _os="$_CYGWIN" \ && return 0 [ -r /etc/os-release ] \ -- cgit v1.2.3