From 03bb0db663f75f26e2489c84567ceb0520af288e Mon Sep 17 00:00:00 2001 From: Zachary Spriggs Date: Mon, 7 Jun 2021 08:37:03 -0400 Subject: [PATCH] Revert "Merge pull request #168 from all-other-usernames-were-taken/patch-1" This reverts commit 0a484500e430fa64b738f11546c4da8b4e826be8, reversing changes made to 3c829db8b23365ab8103220fecea6e07e7b702e7. --- setup_lnx.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/setup_lnx.sh b/setup_lnx.sh index 04a69417f..4295c294b 100755 --- a/setup_lnx.sh +++ b/setup_lnx.sh @@ -73,25 +73,25 @@ fi #Find and install packages if [ "$DISTRO" == "arch" ]; then echo "ArchLinux detected." - pkg_list="gcc zlib xorg-xmessage $GET_WGET" + pkg_list="gcc zlib $GET_WGET" installed_packages=`pacman -Q` installer_command="sudo pacman -S " pkg_install elif [ "$DISTRO" == "linuxmint" ] || [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "zorin" ]; then echo "Debian based distro detected." - pkg_list="g++ x11-utils mesa-common-dev libglu1-mesa-dev libasound2-dev zlib1g-dev $GET_WGET" + pkg_list="g++ mesa-common-dev libglu1-mesa-dev libasound2-dev zlib1g-dev $GET_WGET" installed_packages=`dpkg -l` installer_command="sudo apt-get -y install " pkg_install elif [ "$DISTRO" == "fedora" ] || [ "$DISTRO" == "redhat" ] || [ "$DISTRO" == "centos" ]; then echo "Fedora/Redhat based distro detected." - pkg_list="gcc-c++ xmessage mesa-libGLU-devel alsa-lib-devel zlib-devel $GET_WGET" + pkg_list="gcc-c++ mesa-libGLU-devel alsa-lib-devel zlib-devel $GET_WGET" installed_packages=`yum list installed` installer_command="sudo yum install " pkg_install elif [ "$DISTRO" == "voidlinux" ]; then echo "VoidLinux detected." - pkg_list="gcc xmessage glu-devel zlib-devel alsa-lib-devel $GET_WGET" + pkg_list="gcc glu-devel zlib-devel alsa-lib-devel $GET_WGET" installed_packages=`xbps-query -l |grep -v libgcc` installer_command="sudo xbps-install -Sy " pkg_install @@ -102,7 +102,6 @@ elif [ -z "$DISTRO" ]; then echo " OpenGL developement libraries" echo " ALSA development libraries" echo " GNU C++ Compiler (g++)" - echo " xmessage (x11-utils)" echo " zlib" fi