From 5468df16f1ba4c54fb9b911e6c8ffcbf0e43a808 Mon Sep 17 00:00:00 2001 From: Keith Bennett Date: Sat, 23 Oct 2021 16:38:44 -0500 Subject: [PATCH] rename searchdir to better provide its purpose --- deploy/linux-fixup-rpaths.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/linux-fixup-rpaths.bash b/deploy/linux-fixup-rpaths.bash index 8fbbcaf..931a283 100755 --- a/deploy/linux-fixup-rpaths.bash +++ b/deploy/linux-fixup-rpaths.bash @@ -30,9 +30,9 @@ set -euo pipefail # To set these arguments, set them as an environment variable. For example: -# QTDIR=/opt/qgc-deploy/Qt RPATHDIR=/opt/qgc-deploy/Qt/libs QTCONF_PATH=/opt/qgc-deploy/qt.conf ./linux-post-link.sh -: "${QTDIR:=./Qt}" -: "${RPATHDIR:="${QTDIR}/libs"}" +# SEARCHDIR=/opt/qgc-deploy/Qt RPATHDIR=/opt/qgc-deploy/Qt/libs QTCONF_PATH=/opt/qgc-deploy/qt.conf ./linux-post-link.sh +: "${SEARCHDIR:=./Qt}" +: "${RPATHDIR:="${SEARCHDIR}/libs"}" : "${QTCONF_PATH:=./qt.conf}" # find: @@ -41,7 +41,7 @@ set -euo pipefail # or that end with '.so.5' # and are executable # silence stderr (find will complain if it doesn't have permission to traverse) -find "${QTDIR}" \ +find "${SEARCHDIR}" \ -type f \ -iname '*.so' \ -o -iname '*.so.5' \