|
@@ -172,7 +172,7 @@ function search_for_attached_usb_drive {
|
172
|
172
|
rm -rf /media/usb/.gnupg
|
173
|
173
|
else
|
174
|
174
|
echo 'GPG files did not copy'
|
175
|
|
- exit
|
|
175
|
+ exit 7
|
176
|
176
|
fi
|
177
|
177
|
fi
|
178
|
178
|
if [ -f /media/usb/private_key.gpg ]; then
|
|
@@ -195,7 +195,7 @@ function search_for_attached_usb_drive {
|
195
|
195
|
rm -rf /media/usb/.ssh
|
196
|
196
|
else
|
197
|
197
|
echo 'ssh files did not copy'
|
198
|
|
- exit
|
|
198
|
+ exit 8
|
199
|
199
|
fi
|
200
|
200
|
fi
|
201
|
201
|
if [ -f /media/usb/.emacs ]; then
|
|
@@ -1201,7 +1201,17 @@ function dynamic_dns_freedns {
|
1201
|
1201
|
}
|
1202
|
1202
|
|
1203
|
1203
|
function import_email {
|
|
1204
|
+ EMAIL_COMPLETE_MSG=' *** Freedombone email system installation is complete ***'
|
1204
|
1205
|
if grep -Fxq "import_email" $COMPLETION_FILE; then
|
|
1206
|
+ if [[ $SYSTEM_TYPE == "email" || $SYSTEM_TYPE == "mailbox" ]]; then
|
|
1207
|
+ echo $EMAIL_COMPLETE_MSG
|
|
1208
|
+ if [ -d /media/usb ]; then
|
|
1209
|
+ umount /media/usb
|
|
1210
|
+ rm -rf /media/usb
|
|
1211
|
+ echo ' You can now remove the USB drive'
|
|
1212
|
+ fi
|
|
1213
|
+ exit 0
|
|
1214
|
+ fi
|
1205
|
1215
|
return
|
1206
|
1216
|
fi
|
1207
|
1217
|
if [ $IMPORT_MAILDIR ]; then
|
|
@@ -1211,14 +1221,14 @@ function import_email {
|
1211
|
1221
|
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Maildir
|
1212
|
1222
|
else
|
1213
|
1223
|
echo "Email import directory $IMPORT_MAILDIR not found"
|
1214
|
|
- exit
|
|
1224
|
+ exit 9
|
1215
|
1225
|
fi
|
1216
|
1226
|
fi
|
1217
|
1227
|
echo 'import_email' >> $COMPLETION_FILE
|
1218
|
1228
|
if [[ $SYSTEM_TYPE == "email" || $SYSTEM_TYPE == "mailbox" ]]; then
|
1219
|
1229
|
# unmount any attached usb drive
|
1220
|
1230
|
echo ''
|
1221
|
|
- echo ' *** Freedombone email system installation is complete ***'
|
|
1231
|
+ echo $EMAIL_COMPLETE_MSG
|
1222
|
1232
|
echo ''
|
1223
|
1233
|
if [ -d /media/usb ]; then
|
1224
|
1234
|
umount /media/usb
|