libmakepkg: extract more utility functions

Signed-off-by: Allan McRae <allan@archlinux.org>

scripts/libmakepkg/util/util.sh

@@ -19,7 +19,7 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-[ -n "$LIBMAKEPKG_UTIL_UTIL_SH" ] && return
+[[ -n "$LIBMAKEPKG_UTIL_UTIL_SH" ]] && return
 LIBMAKEPKG_UTIL_UTIL_SH=1
 
 
@@ -36,3 +36,33 @@ in_array() {
 	done
 	return 1 # Not Found
 }
+
+# Canonicalize a directory path if it exists
+canonicalize_path() {
+	local path="$1";
+
+	if [[ -d $path ]]; then
+		(
+			cd_safe "$path"
+			pwd -P
+		)
+	else
+		printf "%s\n" "$path"
+	fi
+}
+
+dir_is_empty() {
+	(
+		shopt -s dotglob nullglob
+		files=("$1"/*)
+		(( ${#files} == 0 ))
+	)
+}
+
+cd_safe() {
+	if ! cd "$1"; then
+		error "$(gettext "Failed to change to directory %s")" "$1"
+		plain "$(gettext "Aborting...")"
+		exit 1
+	fi
+}

scripts/makepkg.sh.in

@@ -1415,14 +1415,6 @@ error_function() {
 	exit 2 # $E_BUILD_FAILED
 }
 
-cd_safe() {
-	if ! cd "$1"; then
-		error "$(gettext "Failed to change to directory %s")" "$1"
-		plain "$(gettext "Aborting...")"
-		exit 1
-	fi
-}
-
 source_safe() {
 	shopt -u extglob
 	if ! source "$@"; then
@@ -2380,28 +2372,6 @@ print_all_package_names() {
 	done
 }
 
-# Canonicalize a directory path if it exists
-canonicalize_path() {
-	local path="$1";
-
-	if [[ -d $path ]]; then
-		(
-			cd_safe "$path"
-			pwd -P
-		)
-	else
-		printf "%s\n" "$path"
-	fi
-}
-
-dir_is_empty() {
-	(
-		shopt -s dotglob nullglob
-		files=("$1"/*)
-		(( ${#files} == 0 ))
-	)
-}
-
 m4_include(library/parseopts.sh)
 
 usage() {