From 9b8b846c403d99b8d056662259758a322f4812cb Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Sun, 17 Jan 2016 14:20:28 -0500
Subject: install_system(): Use non-exiting error()

---
(limited to 'src')

diff --git a/src/install.sh b/src/install.sh
index 27b2a33..434a5f4 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -45,8 +45,8 @@ install_system()
 
 	if ! profile_validate_archplat "${mirror}" "${arch}" "${plat}" \
 			"${suite}"; then
-		error 2 "$(get_msg 'install_bad_archplat')" \
-			"${arch}" "${plat}"
+		error "$(get_msg 'install_bad_archplat')" "${arch}" "${plat}"
+		return 1
 	fi
 
 	info "$(get_msg 'install_selected_arch')" "${arch}"
@@ -55,10 +55,12 @@ install_system()
 
 	info "$(get_msg 'install_setting_up_chroot')"
 	if [ -d "${root}" ] && ! dir_is_empty "${root}" 'lost+found'; then
-		error 2 "$(get_msg 'install_chroot_dir_exists')" "${root}"
+		error "$(get_msg 'install_chroot_dir_exists')" "${root}"
+		return 1
 	fi
 	if ! mkdir -p "${root}/.prokit" "${root}/prokit"; then
-		error 2 "$(get_msg 'install_mkdir_chroot_fail')" "${root}"
+		error "$(get_msg 'install_mkdir_chroot_fail')" "${root}"
+		return 1
 	fi
 	>"${root}/prokit/installing"
 
--
cgit v0.9.1