From 32fed717dcf3f39039222ad728a46c230a599ad5 Mon Sep 17 00:00:00 2001 From: Ken Reese Date: Wed, 6 Sep 2017 13:58:21 -0600 Subject: [PATCH 1/2] Update bootstrap.sh See https://github.com/redox-os/redox/issues/1052 This is just something fast I threw together to get the general idea across of what might fix the problem. I've not yet had a chance to test this. --- bootstrap.sh | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 3f892e4..77a4438 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -512,26 +512,29 @@ else if hash 2>/dev/null pacman; then archLinux "$emulator" fi - # Debian or any derivative of it - if hash 2>/dev/null apt-get; then - ubuntu "$emulator" "$defpackman" - fi - # Fedora - if hash 2>/dev/null dnf; then - fedora "$emulator" - fi # Suse and derivatives if hash 2>/dev/null zypper; then suse "$emulator" + else + # Debian or any derivative of it + if hash 2>/dev/null apt-get; then + ubuntu "$emulator" "$defpackman" + fi + # Fedora + if hash 2>/dev/null dnf; then + fedora "$emulator" + fi + + # Gentoo + if hash 2>/dev/null emerge; then + gentoo "$emulator" + fi + # SolusOS + if hash 2>/dev/null eopkg; then + solus "$emulator" + fi fi - # Gentoo - if hash 2>/dev/null emerge; then - gentoo "$emulator" - fi - # SolusOS - if hash 2>/dev/null eopkg; then - solus "$emulator" - fi + fi if [ "$dependenciesonly" = false ]; then From 4722b4eea1dd1bc6689b81ec024cfd6f494fb6c8 Mon Sep 17 00:00:00 2001 From: Ken Reese Date: Wed, 6 Sep 2017 17:09:10 -0600 Subject: [PATCH 2/2] Update bootstrap.sh --- bootstrap.sh | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 77a4438..d1d47cb 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -507,33 +507,28 @@ banner if [ "Darwin" == "$(uname -s)" ]; then osx "$emulator" else - # Here we will user package managers to determine which operating system the user is using + # Here we will use package managers to determine which operating system the user is using. + # Arch linux if hash 2>/dev/null pacman; then archLinux "$emulator" - fi # Suse and derivatives - if hash 2>/dev/null zypper; then + elif hash 2>/dev/null zypper; then suse "$emulator" - else - # Debian or any derivative of it - if hash 2>/dev/null apt-get; then - ubuntu "$emulator" "$defpackman" - fi - # Fedora - if hash 2>/dev/null dnf; then - fedora "$emulator" - fi - - # Gentoo - if hash 2>/dev/null emerge; then - gentoo "$emulator" - fi - # SolusOS - if hash 2>/dev/null eopkg; then - solus "$emulator" - fi - fi + # Debian or any derivative of it + elif hash 2>/dev/null apt-get; then + ubuntu "$emulator" "$defpackman" + # Fedora + elif hash 2>/dev/null dnf; then + fedora "$emulator" + # Gentoo + elif hash 2>/dev/null emerge; then + gentoo "$emulator" + # SolusOS + elif hash 2>/dev/null eopkg; then + solus "$emulator" + fi + fi