Cleanup some bashisms

3 files changed, 11 insertions, 10 deletions

diff --git a/scripts/builder/build-fetch b/scripts/builder/build-fetch
index 241461e..201c479 100755
--- a/scripts/builder/build-fetch
+++ b/scripts/builder/build-fetch
@@ -13,13 +13,13 @@ build_fetch_clean()
 
 build_fetch_uri()
 {
-	echo -n "${1%%\?*}"
+	printf "${1%%\?*}"
 }
 
 build_fetch_args()
 {
 	set -- $(echo "${1##$(build_fetch_uri "${1}")\?}"|sed -e 's/&/ /')
-	echo -n "${@}"
+	printf "${@}"
 }
 
 build_fetch_name()
@@ -37,7 +37,7 @@ build_fetch_name()
 	esac
 
 	if [ "${build_fetch_name_complete}" -eq "1" ]; then
-		echo -n "${build_fetch_name_var}"
+		printf "${build_fetch_name_var}"
 		unset build_fetch_name_var
 		return
 	fi
@@ -55,13 +55,13 @@ build_fetch_name()
 		die "do not know how to store source from '${1}'"
 	fi
 
-	echo -n "${build_fetch_name_var}"
+	printf "${build_fetch_name_var}"
 	unset build_fetch_name_var
 }
 
 build_fetch_var()
 {
-	echo -n "$(build_fetch_name "${1}" | sed -e 's/[.-]/_/g')"
+	printf "$(build_fetch_name "${1}" | sed -e 's/[.-]/_/g')"
 }
 
 build_fetch_git()
diff --git a/scripts/builder/build-package b/scripts/builder/build-package
index 105fbef..b6f3ee2 100755
--- a/scripts/builder/build-package
+++ b/scripts/builder/build-package
@@ -103,8 +103,9 @@ PKG_LOGFILE="${L}/compile.log"
 
 # pkgconfig can be a right pita...
 PKG_CONFIG_LIBDIR="${SYSROOT}/usr/share/pkgconfig:${SYSROOT}/usr/lib/pkgconfig"
+PKG_CONFIG_SYSROOT_DIR="${SYSROOT}"
 export PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
-export PKG_CONFIG_SYSROOT_DIR="${SYSROOT}"
+export PKG_CONFIG_SYSROOT_DIR
 
 # Don't pass along the builder jobcontrol data to child processes
 unset MAKEFLAGS
diff --git a/scripts/builder/build-query b/scripts/builder/build-query
index d16a06d..f25f1e7 100755
--- a/scripts/builder/build-query
+++ b/scripts/builder/build-query
@@ -8,9 +8,9 @@ parse_pkg_name()
 	fi
 
 	if [ "2${1#*/}" != "2${1}" ]; then
-		echo -n "${1}"
+		printf "${1}"
 	else
-		echo -n "${PROJECT}/${1}"
+		printf "${PROJECT}/${1}"
 	fi
 }
 
@@ -21,7 +21,7 @@ parse_name()
 	fi
 
 	set -- "$(parse_pkg_name "${1}")"
-	echo -n "${1#*/}"
+	printf "${1#*/}"
 }
 
 parse_category()
@@ -31,7 +31,7 @@ parse_category()
 	fi
 
 	set -- "$(parse_pkg_name "${1}")"
-	echo -n "${1%/*}"
+	printf "${1%/*}"
 }
 
 QUERY_ACTION="summary"