summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2016-01-17 14:20:28 (EST)
committer P. J. McDermott <pj@pehjota.net>2016-01-17 14:20:28 (EST)
commit9b8b846c403d99b8d056662259758a322f4812cb (patch)
tree32f6a320446879f714f60724de85a1445f7eb935
parent3ab327e901495d4781860da9ca5b17989904a4ba (diff)
install_system(): Use non-exiting error()
-rw-r--r--src/install.sh10
1 files changed, 6 insertions, 4 deletions
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"