Commit a53bd26c authored by Jeremy Soller's avatar Jeremy Soller

Merge branch 'linux_distrib' into 'master'

Fix linux distribution detection: "pacman" is also a very popular game.

See merge request !1201
parents b699b3b8 7b31f4cd
Pipeline #4598 failed with stage
in 4 minutes and 41 seconds
......@@ -508,11 +508,8 @@ if [ "Darwin" == "$(uname -s)" ]; then
else
# 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"
# Suse and derivatives
elif hash 2>/dev/null zypper; then
if hash 2>/dev/null zypper; then
suse "$emulator"
# Debian or any derivative of it
elif hash 2>/dev/null apt-get; then
......@@ -526,6 +523,9 @@ else
# SolusOS
elif hash 2>/dev/null eopkg; then
solus "$emulator"
# Arch linux
elif hash 2>/dev/null pacman; then
archLinux "$emulator"
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment