From 7cc24161052f2127f906ed1c1cd9564959ef9f25 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 10 Jun 2013 16:56:35 +0200
Subject: [binutil.h] Consider $REQUIRED_LDD_BLACKLIST when fetching dynamic
 dependencies [kdm] Blacklist libQtWebKit - it's 25M and of no use (yet?)

---
 remote/setup_target | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'remote/setup_target')

diff --git a/remote/setup_target b/remote/setup_target
index 369cdbac..286daf3a 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -46,11 +46,11 @@ read_build () {
 
 copy_files_with_deps () {
 
-	[ ! -d $MODULE_BUILD_DIR ] && pinfo "No build directory found, skipping dependency copying" && return 0
-	cd $MODULE_BUILD_DIR
+	[ ! -d "$MODULE_BUILD_DIR" ] && pinfo "No build directory found, skipping dependency copying" && return 0
+	cd "$MODULE_BUILD_DIR"
 
 	COPYFILES_LIST="list_wanted_stage3.2"
-	[ -e ${COPYFILES_LIST} ] && rm ${COPYFILES_LIST}
+	[ -e "${COPYFILES_LIST}" ] && rm "${COPYFILES_LIST}"
 
 		
 	[ ! -z "${REQUIRED_BINARIES}" ] && pinfo "Gathering required binaries from config file..."
@@ -58,7 +58,7 @@ copy_files_with_deps () {
 	do
 		local FILE_CANDIDATES=$( find . -name "${FILENAME}" -a \( -type f -o -type l \) )
 		# only do if more than one candidate found
-		if [ $(echo $FILE_CANDIDATES | wc -w) -gt 1 ]; then
+		if [ "$(echo $FILE_CANDIDATES | wc -w)" -gt 1 ]; then
 			pdebug "Candidates for $FILENAME are: $(echo $FILE_CANDIDATES)"
 			local FINAL_LIST=""
 			for FILE in $FILE_CANDIDATES; do
@@ -82,7 +82,7 @@ copy_files_with_deps () {
 		fi
 		for FILE in $FINAL_LIST; do
 			pdebug "* $FILE"
-			strip $FILE || pwarning "Could not strip '${FILE}'"
+			strip "$FILE" || pwarning "Could not strip '${FILE}'"
 			get_link_chain "${MODULE_BUILD_DIR}/${FILE}" "${MODULE_BUILD_DIR}" >> "${COPYFILES_LIST}"
 			get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${FILE}" >> "${COPYFILES_LIST}"
 		done
@@ -94,7 +94,7 @@ copy_files_with_deps () {
 		for LOCATION in $(find . -name ${LIB}.so\*)
 		do
 			pdebug "* $LOCATION"
-			strip $LOCATION || pwarning "Could not strip '${LOCATION}'"
+			strip "$LOCATION" || pwarning "Could not strip '${LOCATION}'"
 			get_link_chain "${MODULE_BUILD_DIR}/${LOCATION}" "${MODULE_BUILD_DIR}"  >> "${COPYFILES_LIST}"
 			get_dynamic_dependencies -l "${MODULE_BUILD_DIR}" "${LOCATION}" >> "${COPYFILES_LIST}"
 		done
@@ -141,10 +141,10 @@ generate_target() {
 	TARGET_BUILD_DIR="${MODE_DIR}/builds/${TARGET}"
 	[ -e "${ROOT_DIR}/logs/${TARGET}.size" ] && . "${ROOT_DIR}/logs/${TARGET}.size" || echo "declare -A BUILD_SIZE" >> "${ROOT_DIR}/logs/${TARGET}.size" 
 
-	[ -d $TARGET_DIR ] || perror "Given target directory does not exist: $TARGET_DIR"
+	[ -d "$TARGET_DIR" ] || perror "Given target directory does not exist: $TARGET_DIR"
 
-	[[ $TARGET == builds || $TARGET == modules ]] && \
-		perror "Target directory cannot be named 'builds' nor 'modules'."
+	[[ "$TARGET" == "builds" || "$TARGET" == "modules" ]] && \
+		perror "Target directory cannot be named 'builds' or 'modules'."
 	
 	pinfo "Generating '$TARGET_BUILD_DIR' for '$TARGET'"
 
-- 
cgit v1.2.3-55-g7522