Handle required binaries that are symlinks properly

1 files changed, 20 insertions, 6 deletions

diff --git a/remote/setup_tools b/remote/setup_tools
index e0c092a4..24f2a291 100755
--- a/remote/setup_tools
+++ b/remote/setup_tools
@@ -56,15 +56,29 @@ copyfileswithdependencies ()
 	[ ! -z "${REQUIRED_BINARIES}" ] && pinfo "Gathering required binaries from config file..."
 	for FILENAME in ${REQUIRED_BINARIES}
 	do
-		FILE=$(find . -name "${FILENAME}" -type f -executable | xargs grep -l -E '^(.ELF|#!)' | head -1)
-		if [ -z "$FILE" ]; then
+		local FILE_CANDIDATES=$( find . -name "${FILENAME}" -a \( -type f -o -type l \) )
+		pdebug "Candidates for $FILENAME are: $FILE_CANDIDATES"
+		local FINAL_LIST=""
+		for FILE in $FILE_CANDIDATES; do
+			local TESTFILE="$(readlink -f "$FILE")"
+			pdebug "  $FILE leads to $TESTFILE"
+			[ -f "$TESTFILE" -a -x "$TESTFILE" ] && [ "x$(grep -l -E '^(.ELF|#!)' "$TESTFILE")" != "x" ] && FINAL_LIST="$FINAL_LIST $FILE"
+		done
+		FINAL_LIST=$(trim "$FINAL_LIST")
+		pdebug "    Final list is $FINAL_LIST"
+		if [ -z "$FINAL_LIST" ]; then
 			pwarning "\tNo Binary found for ${FILENAME}. Skipping." 
 			continue
 		fi
-	
-		pdebug "\tFound ${FILENAME} at ${FILE}"
-		get_link_chain "${TOOL_DIR}/${TOOL}/build/${FILE}" "${TOOL_DIR}/${TOOL}/build" >> "${COPYFILES_LIST}"
-		get_dynamic_dependencies -l "${TOOL_DIR}/${TOOL}/build" "${FILE}" >> "${COPYFILES_LIST}"
+		if [[ "$FINAL_LIST" == *" "* ]]; then
+			pwarning "Found more than one match for required file '$FILENAME': $FINAL_LIST"
+		else
+			pdebug "\tFound ${FILENAME} at ${FILE}"
+		fi
+		for FILE in $FINAL_LIST; do
+			get_link_chain "${TOOL_DIR}/${TOOL}/build/${FILE}" "${TOOL_DIR}/${TOOL}/build" >> "${COPYFILES_LIST}"
+			get_dynamic_dependencies -l "${TOOL_DIR}/${TOOL}/build" "${FILE}" >> "${COPYFILES_LIST}"
+		done
 	done
 
 	[ ! -z "${REQUIRED_LIBRARIES}" ] && pinfo "Gathering required libraries from config file..."