From f9b5e233eddd7dc667ec80eac3bca355c4b9a172 Mon Sep 17 00:00:00 2001 From: medusalix Date: Thu, 9 Apr 2020 14:03:11 +0200 Subject: [PATCH 1/2] Improve os-release parsing --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 8bc48280..04fc230c 100755 --- a/build.sh +++ b/build.sh @@ -14,7 +14,7 @@ for os_release in ${OS_RELEASE_FILES[@]} ; do if [[ ! -e "${os_release}" ]]; then continue fi - DISTRO=$(sed 1q ${os_release} | sed 's/NAME=//g' | sed 's/"//g') + DISTRO=$(sed -rn 's/^NAME="(.+)"/\1/p' ${os_release}) done dependencies() { From 4906140a49e4159584c5267106c06fb7e0a12c94 Mon Sep 17 00:00:00 2001 From: medusalix Date: Thu, 9 Apr 2020 14:03:35 +0200 Subject: [PATCH 2/2] Fix Debian os-release name --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 04fc230c..786624bb 100755 --- a/build.sh +++ b/build.sh @@ -60,7 +60,7 @@ dependencies() { DEPS="{glibc-devel.i686,libstdc++-devel.i686,libX11-devel.i686}" install ;; - *"buntu"|"Linux Mint"|"Debian"|"Zorin OS"|"Pop!_OS"|"elementary OS") + *"buntu"|"Linux Mint"|"Debian GNU/Linux"|"Zorin OS"|"Pop!_OS"|"elementary OS") MANAGER_QUERY="dpkg-query -s" MANAGER_INSTALL="apt install" DEPS="{gcc,g++,gcc-multilib,g++-multilib,ninja-build,python3-pip,python3-setuptools,python3-wheel,pkg-config,mesa-common-dev,libx11-dev:i386}"