From 27c5de3572a14ec9ff7595799d14c7b18441f15b Mon Sep 17 00:00:00 2001 From: deopdeop <45722321+deopdeop@users.noreply.github.com> Date: Tue, 24 Nov 2020 20:23:49 +0000 Subject: [PATCH 1/2] Added linux distribution checking to install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 472281d052..ff95b477cd 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/bash # Ubuntu (apt) -if command -v apt &> /dev/null; then +if cat /etc/os-release | grep ID=ubuntu &> /dev/null; then echo "Installing packages for Ubuntu (apt)" sudo apt install -y git python3 python3-pip python3-setuptools build-essential binutils-mips-linux-gnu zlib1g-dev libyaml-dev || exit 1 @@ -18,7 +18,7 @@ if command -v apt &> /dev/null; then fi # Arch Linux (pacman) -if command -v pacman &> /dev/null; then +if cat /etc/os-release | grep ID=arch &> /dev/null; then echo "Installing packages for Arch Linux (pacman)" # Upgrade existing packages (note: no --noconfirm) From 8ae010eb8e85941b716baafa151f2d85099d1cdc Mon Sep 17 00:00:00 2001 From: Ryan Wilson <45722321+deopdeop@users.noreply.github.com> Date: Tue, 24 Nov 2020 15:45:37 -0500 Subject: [PATCH 2/2] More checking in install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index ff95b477cd..6f4d7995c6 100755 --- a/install.sh +++ b/install.sh @@ -59,7 +59,7 @@ if cat /etc/os-release | grep ID=arch &> /dev/null; then fi # openSUSE (zypper) -if command -v zypper &> /dev/null; then +if cat /etc/os-release | grep ID=opensuse &> /dev/null; then echo "Installing packages for openSUSE (zypper)" sudo zypper -n install git python3 python3-devel python3-pip python3-setuptools gcc gcc-c++ glibc-devel make cross-mips-binutils zlib-devel libyaml-devel @@ -94,7 +94,7 @@ if command -v zypper &> /dev/null; then fi # Alpine Linux (apk) -if command -v apk &> /dev/null; then +if cat /etc/os-release | grep ID=alpine &> /dev/null; then echo "Installing packages for Alpine Linux (apk)" # If the edge/community repo isn't present, it needs to be for astyle