From ccbaf2c5310e48f38303df311a1e3f9f90a2509e Mon Sep 17 00:00:00 2001 From: Maurice O'Neal Date: Thu, 19 Sep 2019 12:51:51 -0400 Subject: [PATCH] Fixed a bug with the linux build script I learned the Qt binaries directory can end up in a non-standard directory seperate from the Qt libaries and plugins and this kind of setup would cause the script to fail to copy all needed files. To fix this, i hard coded the standard directory: '/usr/lib/x86_64-linux-gnu/qt5/bin' into the script instead of having it call qtpaths. Ended users that have even further customized setups will need modify the build script themselves to make sure all references to $qt_dir points to the correct directory for their dev setup. --- linux_build.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/linux_build.sh b/linux_build.sh index ea8ad6b..e104c7b 100644 --- a/linux_build.sh +++ b/linux_build.sh @@ -13,9 +13,13 @@ tmp_dir="$HOME/.cache/cmdr_build" if [ ! -d "$qt_dir" ]; then - echo "a path to Qt was not provided, attempting to get it from 'qtpaths.'" + echo "a valid path to Qt was not provided, falling back to the default: /usr/lib/x86_64-linux-gnu/qt5/bin" - qt_dir="$(qtpaths --binaries-dir)" + qt_dir="/usr/lib/x86_64-linux-gnu/qt5/bin" + +else + + PATH=$qt_dir:$PATH fi @@ -36,10 +40,7 @@ if [ $? -eq 0 -a -d "$qt_dir" ]; then mkdir -vp $tmp_dir cp -rv $src_dir/. $tmp_dir cd $tmp_dir - - PATH=$qt_dir:$PATH - - $qt_dir/qmake -config release + qmake -config release if [ $? -eq 0 ]; then