| 
				
			 | 
			
			
				@@ -119,9 +119,13 @@ function interactive_gpg_from_usb { 
			 | 
		
	
		
			
			| 
				119
			 | 
			
				119
			 | 
			
			
				             cp -r $USB_MOUNT/letsencrypt/* /etc/letsencrypt 
			 | 
		
	
		
			
			| 
				120
			 | 
			
				120
			 | 
			
			
				         fi 
			 | 
		
	
		
			
			| 
				121
			 | 
			
				121
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				122
			 | 
			
				
			 | 
			
			
				-        if [ -f $USB_MOUNT/.mastergpgkey && -f $USB_MOUNT/.backupgpgkey ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				122
			 | 
			
			
				+        if [ -f $USB_MOUNT/.mastergpgkey ]; then 
			 | 
		
	
		
			
			| 
				123
			 | 
			
				123
			 | 
			
			
				             # Recovering keys from file rather than just copying the gnupg 
			 | 
		
	
		
			
			| 
				124
			 | 
			
				124
			 | 
			
			
				             # directory may help to avoid problems during upgrades/reinstalls 
			 | 
		
	
		
			
			| 
				
			 | 
			
				125
			 | 
			
			
				+            if [ ! -f $USB_MOUNT/.backupgpgkey ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				126
			 | 
			
			
				+                echo $'No backup key file found on USB drive' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				127
			 | 
			
			
				+                exit 725729 
			 | 
		
	
		
			
			| 
				
			 | 
			
				128
			 | 
			
			
				+            fi 
			 | 
		
	
		
			
			| 
				125
			 | 
			
				129
			 | 
			
			
				             gpg --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.mastergpgkey 
			 | 
		
	
		
			
			| 
				126
			 | 
			
				130
			 | 
			
			
				             echo "$BACKUP_DUMMY_PASSWORD" | gpg --batch --passphrase-fd 0 --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $USB_MOUNT/.backupgpgkey 
			 | 
		
	
		
			
			| 
				127
			 | 
			
				131
			 | 
			
			
				             if [ -d /home/$MY_USERNAME/.gnupg ]; then 
			 |