|  | @@ -1499,7 +1499,7 @@ function create_gpg_subkey {
 | 
	
		
			
			| 1499 | 1499 |      echo "Name-Comment: $GPG_KEY_USAGE" >> /home/$MY_USERNAME/gpg-genkey.conf
 | 
	
		
			
			| 1500 | 1500 |      echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
 | 
	
		
			
			| 1501 | 1501 |      chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
 | 
	
		
			
			| 1502 |  | -    su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
 | 
	
		
			
			|  | 1502 | +    su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
 | 
	
		
			
			| 1503 | 1503 |      chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
 | 
	
		
			
			| 1504 | 1504 |  
 | 
	
		
			
			| 1505 | 1505 |      shred -zu /home/$MY_USERNAME/gpg-genkey.conf
 | 
	
	
		
			
			|  | @@ -1614,7 +1614,7 @@ function configure_gpg {
 | 
	
		
			
			| 1614 | 1614 |          echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
 | 
	
		
			
			| 1615 | 1615 |          chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
 | 
	
		
			
			| 1616 | 1616 |          echo $'Generating a new GPG key'
 | 
	
		
			
			| 1617 |  | -        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
 | 
	
		
			
			|  | 1617 | +        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
 | 
	
		
			
			| 1618 | 1618 |          chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
 | 
	
		
			
			| 1619 | 1619 |          KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
 | 
	
		
			
			| 1620 | 1620 |          if [[ $KEY_EXISTS == "no" ]]; then
 |