free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure exit if email installation is complete

This commit is contained in:
Bob Mottram 2014-09-23 22:13:42 +01:00
parent 05b7cf2fa2
commit d359344fd7
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
install-freedombone.sh
View File

@ -172,7 +172,7 @@ function search_for_attached_usb_drive {
rm -rf /media/usb/.gnupg rm -rf /media/usb/.gnupg
else else
echo 'GPG files did not copy' echo 'GPG files did not copy'
exit exit 7
fi fi
fi fi
if [ -f /media/usb/private_key.gpg ]; then if [ -f /media/usb/private_key.gpg ]; then
@ -195,7 +195,7 @@ function search_for_attached_usb_drive {
rm -rf /media/usb/.ssh rm -rf /media/usb/.ssh
else else
echo 'ssh files did not copy' echo 'ssh files did not copy'
exit exit 8
fi fi
fi fi
if [ -f /media/usb/.emacs ]; then if [ -f /media/usb/.emacs ]; then
@ -1201,7 +1201,17 @@ function dynamic_dns_freedns {
} }
function import_email { function import_email {
EMAIL_COMPLETE_MSG=' *** Freedombone email system installation is complete ***'
if grep -Fxq "import_email" $COMPLETION_FILE; then if grep -Fxq "import_email" $COMPLETION_FILE; then
if [[ $SYSTEM_TYPE == "email" || $SYSTEM_TYPE == "mailbox" ]]; then
echo $EMAIL_COMPLETE_MSG
if [ -d /media/usb ]; then
umount /media/usb
rm -rf /media/usb
echo ' You can now remove the USB drive'
fi
exit 0
fi
return return
fi fi
if [ $IMPORT_MAILDIR ]; then if [ $IMPORT_MAILDIR ]; then
@ -1211,14 +1221,14 @@ function import_email {
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Maildir chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Maildir
else else
echo "Email import directory $IMPORT_MAILDIR not found" echo "Email import directory $IMPORT_MAILDIR not found"
exit exit 9
fi fi
fi fi
echo 'import_email' >> $COMPLETION_FILE echo 'import_email' >> $COMPLETION_FILE
if [[ $SYSTEM_TYPE == "email" || $SYSTEM_TYPE == "mailbox" ]]; then if [[ $SYSTEM_TYPE == "email" || $SYSTEM_TYPE == "mailbox" ]]; then
# unmount any attached usb drive # unmount any attached usb drive
echo '' echo ''
echo ' *** Freedombone email system installation is complete ***' echo $EMAIL_COMPLETE_MSG
echo '' echo ''
if [ -d /media/usb ]; then if [ -d /media/usb ]; then
umount /media/usb umount /media/usb