3a4
> # Copyright (c) 2013 Devin Teske
27c28,30
< # $FreeBSD: stable/10/usr.sbin/bsdinstall/scripts/script 256340 2013-10-11 20:28:30Z des $
---
> # $FreeBSD: stable/10/usr.sbin/bsdinstall/scripts/script 258421 2013-11-21 03:40:52Z dteske $
> #
> ############################################################ INCLUDES
28a32,39
> BSDCFG_SHARE="/usr/share/bsdconfig"
> . $BSDCFG_SHARE/common.subr || exit 1
> f_dprintf "%s: loading includes..." "$0"
> f_include $BSDCFG_SHARE/dialog.subr
> f_include $BSDCFG_SHARE/variable.subr
>
> ############################################################ CONFIGURATION
>
34,38c45,65
< error() {
< test -f $PATH_FSTAB && bsdinstall umount
< echo "Installation Error!"
< cat $BSDINSTALL_LOG
< echo "Installation Error!"
---
> ############################################################ GLOBALS
>
> #
> # Strings that should be moved to an i18n file and loaded with f_include_lang()
> #
> msg_installation_error="Installation Error!"
>
> ############################################################ FUNCTIONS
>
> error()
> {
> [ -f "$PATH_FSTAB" ] && bsdinstall umount
>
> local file
> f_getvar "$VAR_DEBUG_FILE#+" file
> if [ "$file" ]; then
> f_dialog_title "$msg_installation_error"
> f_dialog_textbox "$file"
> # No need to restore title, pining for the fjords
> fi
>
41a69,70
> ############################################################ MAIN
>
48c77
< echo "Begun Installation at $(date)" > $BSDINSTALL_LOG
---
> f_dprintf "Began Instalation at %s" "$( date )"
57a87,94
> # Re-initialize a new log if preamble changed BSDINSTALL_LOG
> if [ "$BSDINSTALL_LOG" != "${debugFile#+}" ]; then
> export debugFile="$BSDINSTALL_LOG"
> f_quietly f_debug_init
> # NB: Being scripted, let debug go to terminal for invalid debugFile
> f_dprintf "Began Instalation at %s" "$( date )"
> fi
>
89c126
< echo "Installation Completed at $(date)" >> $BSDINSTALL_LOG
---
> f_dprintf "Installation Completed at %s" "$( date )"
91a129,132
>
> ################################################################################
> # END
> ################################################################################