diff options
| author | Simon Fontana Oscarsson <[email protected]> | 2021-05-09 17:22:29 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-09 11:22:29 -0400 |
| commit | 123dfca59456873e554b29d815e0fc43d7563b08 (patch) | |
| tree | 3d9b6aee2a8f7a15e1f156467a1f69dd6ff5860a /utils/installer/install.sh | |
| parent | 4de1cb5a57adfeb6b460c6a8b7a0649f5312f960 (diff) | |
Use os-release file to check Ubuntu distro (#381)
Previous check uname -a does not work if user has changed kernel.
Use os-release for true operating system identification.
Diffstat (limited to 'utils/installer/install.sh')
| -rwxr-xr-x | utils/installer/install.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 7726fd2e..4db157e6 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -33,7 +33,7 @@ installnodefedora() { installnode() { echo "Installing node..." [ "$(uname)" == "Darwin" ] && installnodemac - [ -n "$(uname -a | grep Ubuntu)" ] && installnodeubuntu + [ -n "$(cat /etc/os-release | grep Ubuntu)" ] && installnodeubuntu [ -f "/etc/arch-release" ] && installnodearch [ -f "/etc/artix-release" ] && installnodearch [ -f "/etc/fedora-release" ] && installnodefedora @@ -62,7 +62,7 @@ installpiponfedora() { installpip() { echo "Installing pip..." [ "$(uname)" == "Darwin" ] && installpiponmac - [ -n "$(uname -a | grep Ubuntu)" ] && installpiponubuntu + [ -n "$(cat /etc/os-release | grep Ubuntu)" ] && installpiponubuntu [ -f "/etc/arch-release" ] && installpiponarch [ -f "/etc/fedora-release" ] && installpiponfedora [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ] && echo "Windows not currently supported" @@ -135,7 +135,7 @@ installonfedora() { installextrapackages() { [ "$(uname)" == "Darwin" ] && installonmac - [ -n "$(uname -a | grep Ubuntu)" ] && installonubuntu + [ -n "$(cat /etc/os-release | grep Ubuntu)" ] && installonubuntu [ -f "/etc/arch-release" ] && installonarch [ -f "/etc/artix-release" ] && installonarch [ -f "/etc/fedora-release" ] && installonfedora |