|
@@ -205,31 +205,34 @@ function search_for_attached_usb_drive {
|
205
|
205
|
mkdir /media/usb
|
206
|
206
|
mount $USB_DRIVE /media/usb
|
207
|
207
|
fi
|
208
|
|
- if [ -d /media/usb/Maildir ]; then
|
209
|
|
- echo 'Maildir found on USB drive'
|
210
|
|
- IMPORT_MAILDIR=/media/usb/Maildir
|
211
|
|
- fi
|
212
|
|
- if [ -d /media/usb/.gnupg ]; then
|
213
|
|
- echo 'Importing GPG keyring'
|
214
|
|
- cp -r /media/usb/.gnupg /home/$MY_USERNAME
|
215
|
|
- chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
|
216
|
|
- if [ -f /home/$MY_USERNAME/.gnupg/secring.gpg ]; then
|
217
|
|
- shred -zu /media/usb/.gnupg/secring.gpg
|
218
|
|
- shred -zu /media/usb/.gnupg/random_seed
|
219
|
|
- shred -zu /media/usb/.gnupg/trustdb.gpg
|
220
|
|
- rm -rf /media/usb/.gnupg
|
221
|
|
- else
|
222
|
|
- echo 'GPG files did not copy'
|
223
|
|
- exit 7
|
|
208
|
+ if ! [[ $SYSTEM_TYPE == "cloud" || $SYSTEM_TYPE == "chat" || $SYSTEM_TYPE == "social" ]]; then
|
|
209
|
+ if [ -d /media/usb/Maildir ]; then
|
|
210
|
+ echo 'Maildir found on USB drive'
|
|
211
|
+ IMPORT_MAILDIR=/media/usb/Maildir
|
|
212
|
+ fi
|
|
213
|
+ if [ -d /media/usb/.gnupg ]; then
|
|
214
|
+ echo 'Importing GPG keyring'
|
|
215
|
+ cp -r /media/usb/.gnupg /home/$MY_USERNAME
|
|
216
|
+ chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
|
|
217
|
+ if [ -f /home/$MY_USERNAME/.gnupg/secring.gpg ]; then
|
|
218
|
+ shred -zu /media/usb/.gnupg/secring.gpg
|
|
219
|
+ shred -zu /media/usb/.gnupg/random_seed
|
|
220
|
+ shred -zu /media/usb/.gnupg/trustdb.gpg
|
|
221
|
+ rm -rf /media/usb/.gnupg
|
|
222
|
+ else
|
|
223
|
+ echo 'GPG files did not copy'
|
|
224
|
+ exit 7
|
|
225
|
+ fi
|
|
226
|
+ fi
|
|
227
|
+
|
|
228
|
+ if [ -f /media/usb/private_key.gpg ]; then
|
|
229
|
+ echo 'GPG private key found on USB drive'
|
|
230
|
+ MY_GPG_PRIVATE_KEY=/media/usb/private_key.gpg
|
|
231
|
+ fi
|
|
232
|
+ if [ -f /media/usb/public_key.gpg ]; then
|
|
233
|
+ echo 'GPG public key found on USB drive'
|
|
234
|
+ MY_GPG_PUBLIC_KEY=/media/usb/public_key.gpg
|
224
|
235
|
fi
|
225
|
|
- fi
|
226
|
|
- if [ -f /media/usb/private_key.gpg ]; then
|
227
|
|
- echo 'GPG private key found on USB drive'
|
228
|
|
- MY_GPG_PRIVATE_KEY=/media/usb/private_key.gpg
|
229
|
|
- fi
|
230
|
|
- if [ -f /media/usb/public_key.gpg ]; then
|
231
|
|
- echo 'GPG public key found on USB drive'
|
232
|
|
- MY_GPG_PUBLIC_KEY=/media/usb/public_key.gpg
|
233
|
236
|
fi
|
234
|
237
|
if [ -d /media/usb/.ssh ]; then
|
235
|
238
|
echo 'Importing ssh keys'
|