From 680c65fe0b8f5740be0958576564384ba692f5a5 Mon Sep 17 00:00:00 2001 From: Matthew Kilgore Date: Fri, 9 Dec 2022 17:04:31 -0500 Subject: [PATCH 1/2] Add curl to package lists libcurl is now a dependency, so the curl package needs to be installed on Linux (very likely to already be there) along with the development files (some distros have separate 'devel' packages). Fixes: #265 --- setup_lnx.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup_lnx.sh b/setup_lnx.sh index cf787737e..8e09a62ce 100755 --- a/setup_lnx.sh +++ b/setup_lnx.sh @@ -75,7 +75,7 @@ fi #Find and install packages if [ "$DISTRO" == "arch" ]; then echo "ArchLinux detected." - pkg_list="gcc make zlib xorg-xmessage $GET_WGET" + pkg_list="gcc make zlib xorg-xmessage curl $GET_WGET" installed_packages=`pacman -Q` installer_command="sudo pacman -S " pkg_install @@ -87,13 +87,13 @@ elif [ "$DISTRO" == "linuxmint" ] || [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == pkg_install elif [ "$DISTRO" == "fedora" ] || [ "$DISTRO" == "redhat" ] || [ "$DISTRO" == "centos" ]; then echo "Fedora/Redhat based distro detected." - pkg_list="gcc-c++ make xmessage mesa-libGLU-devel alsa-lib-devel zlib-devel $GET_WGET" + pkg_list="gcc-c++ make xmessage mesa-libGLU-devel alsa-lib-devel zlib-devel libcurl-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 make xmessage glu-devel zlib-devel alsa-lib-devel $GET_WGET" + pkg_list="gcc make xmessage glu-devel zlib-devel alsa-lib-devel libcurl-devel $GET_WGET" installed_packages=`xbps-query -l |grep -v libgcc` installer_command="sudo xbps-install -Sy " pkg_install From 9eed3af1087f7cf7c939f5acca6be46b53bcbcb2 Mon Sep 17 00:00:00 2001 From: Matthew Kilgore Date: Fri, 9 Dec 2022 17:04:41 -0500 Subject: [PATCH 2/2] Remove xmessage as a required package on Linux xmessage is no longer a required dependency due to the addition of tinyfiledialogs. xmessage is an option, but there are both better alternatives on Linux and backup options if xmessage and friends cannot be found so it is not required. --- setup_lnx.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/setup_lnx.sh b/setup_lnx.sh index 8e09a62ce..878de012b 100755 --- a/setup_lnx.sh +++ b/setup_lnx.sh @@ -75,7 +75,7 @@ fi #Find and install packages if [ "$DISTRO" == "arch" ]; then echo "ArchLinux detected." - pkg_list="gcc make zlib xorg-xmessage curl $GET_WGET" + pkg_list="gcc make zlib curl $GET_WGET" installed_packages=`pacman -Q` installer_command="sudo pacman -S " pkg_install @@ -87,13 +87,13 @@ elif [ "$DISTRO" == "linuxmint" ] || [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == pkg_install elif [ "$DISTRO" == "fedora" ] || [ "$DISTRO" == "redhat" ] || [ "$DISTRO" == "centos" ]; then echo "Fedora/Redhat based distro detected." - pkg_list="gcc-c++ make xmessage mesa-libGLU-devel alsa-lib-devel zlib-devel libcurl-devel $GET_WGET" + pkg_list="gcc-c++ make mesa-libGLU-devel alsa-lib-devel zlib-devel libcurl-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 make xmessage glu-devel zlib-devel alsa-lib-devel libcurl-devel $GET_WGET" + pkg_list="gcc make glu-devel zlib-devel alsa-lib-devel libcurl-devel $GET_WGET" installed_packages=`xbps-query -l |grep -v libgcc` installer_command="sudo xbps-install -Sy " pkg_install @@ -104,7 +104,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