From 5295b41e5fe90db9f2af91a0ba6d9e7b662e346d Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Fri, 26 Apr 2019 00:27:12 -0400
Subject: src/cmd/installer-pc.sh: Define functions before references

---
diff --git a/src/cmd/installer-pc.sh b/src/cmd/installer-pc.sh
index 33b2e7c..b41402a 100644
--- a/src/cmd/installer-pc.sh
+++ b/src/cmd/installer-pc.sh
@@ -20,6 +20,57 @@
 
 cmd_installer_pc_optstring='a:p:m:'
 
+cmd_installer_pc_log_print()
+{
+	local prefix="${1}"
+	local log="${2}"
+	local line=
+
+	IFS="${LF}"
+	for line in ${log}; do
+		error '%s: %s' "${prefix}" "${line}"
+	done
+	unset IFS
+}
+
+cmd_installer_pc_make_partition_and_fs()
+{
+	local dev="${1}"
+	local log=
+
+	info "$(get_msg 'cmd_installer_pc_dd')"
+	if ! log="$(dd if=/dev/zero of="${dev}" bs=512 count=1 2>&1)"; then
+		error "$(get_msg 'cmd_installer_pc_dd_fail')"
+		cmd_installer_pc_log_print 'dd' "${log}"
+		return 1
+	fi
+
+	info "$(get_msg 'cmd_installer_pc_fdisk')"
+	if ${HAVE_SFDISK}; then
+		if ! log="$(printf ',,83,*\n' | ${SFDISK} "${dev}" 2>&1)"; then
+			error "$(get_msg 'cmd_installer_pc_fdisk_fail')"
+			cmd_installer_pc_log_print 'sfdisk' "${log}"
+			return 1
+		fi
+	elif ${HAVE_FDISK}; then
+		if ! log="$(printf 'n\np\n1\n\n\nt\n83\na\n1\nw\n' |
+				${FDISK} "${dev}" 2>&1)"; then
+			error "$(get_msg 'cmd_installer_pc_fdisk_fail')"
+			cmd_installer_pc_log_print 'fdisk' "${log}"
+			return 1
+		fi
+	fi
+
+	info "$(get_msg 'cmd_installer_pc_mkfs')"
+	if ! log="$(${MKE2FS} -t ext4 "${dev}1" 2>&1)"; then
+		error "$(get_msg 'cmd_installer_pc_mkfs_fail')"
+		cmd_installer_pc_log_print 'mke2fs' "${log}"
+		return 1
+	fi
+
+	return 0
+}
+
 cmd_installer_pc_main()
 {
 	local suite=
@@ -87,57 +138,6 @@ cmd_installer_pc_main()
 	return 0
 }
 
-cmd_installer_pc_make_partition_and_fs()
-{
-	local dev="${1}"
-	local log=
-
-	info "$(get_msg 'cmd_installer_pc_dd')"
-	if ! log="$(dd if=/dev/zero of="${dev}" bs=512 count=1 2>&1)"; then
-		error "$(get_msg 'cmd_installer_pc_dd_fail')"
-		cmd_installer_pc_log_print 'dd' "${log}"
-		return 1
-	fi
-
-	info "$(get_msg 'cmd_installer_pc_fdisk')"
-	if ${HAVE_SFDISK}; then
-		if ! log="$(printf ',,83,*\n' | ${SFDISK} "${dev}" 2>&1)"; then
-			error "$(get_msg 'cmd_installer_pc_fdisk_fail')"
-			cmd_installer_pc_log_print 'sfdisk' "${log}"
-			return 1
-		fi
-	elif ${HAVE_FDISK}; then
-		if ! log="$(printf 'n\np\n1\n\n\nt\n83\na\n1\nw\n' |
-				${FDISK} "${dev}" 2>&1)"; then
-			error "$(get_msg 'cmd_installer_pc_fdisk_fail')"
-			cmd_installer_pc_log_print 'fdisk' "${log}"
-			return 1
-		fi
-	fi
-
-	info "$(get_msg 'cmd_installer_pc_mkfs')"
-	if ! log="$(${MKE2FS} -t ext4 "${dev}1" 2>&1)"; then
-		error "$(get_msg 'cmd_installer_pc_mkfs_fail')"
-		cmd_installer_pc_log_print 'mke2fs' "${log}"
-		return 1
-	fi
-
-	return 0
-}
-
-cmd_installer_pc_log_print()
-{
-	local prefix="${1}"
-	local log="${2}"
-	local line=
-
-	IFS="${LF}"
-	for line in ${log}; do
-		error '%s: %s' "${prefix}" "${line}"
-	done
-	unset IFS
-}
-
 cmd_installer_pc_register()
 {
 	register_cmd 'installer-pc'
--
cgit v0.9.1