Merge branch 'develop'

Author: Lou van der Laarse

README.md

@@ -50,6 +50,9 @@ Removes all previous loaded keys and adds the specified key to the ssh-agent for
 E.G: `sh load id_rsa 2` will load the id_rsa key for 2 hours.
 E.G: `sh load common` will load the common key for 1 hour.
 
+### `sh show <keyname>`
+Prints the public key for they private/public key pair with the name `<keyname>`. Useful for adding the public key to services like Bitbucket, Github, etc...
+
 ### `sh endsession`
 Forcefully clear the gpg-agent files from your `masterkey` directory and clear loaded ssh keys from the ssh-agent.
 

add

@@ -23,6 +23,9 @@ function load_private_key {
 
     # Encrypt keys
     encrypt_private_keys
+
+    clear_gpg_agent_files
+    kill_agent
 }
 
 function load_full_key {
@@ -31,6 +34,8 @@ function load_full_key {
     decrypt_private_keys
     decrypt_all_keys
     flush_passphrase_cache
+    clear_gpg_agent_files
+    kill_agent
     untar
 
     # Get private keys and copy sources.
@@ -55,6 +60,7 @@ if is_encrypted; then
     else
         load_full_key
     fi
+    clear_gpg_agent_files
 else
     echo "ERROR! 'sh add' only works when the drive is encrypted!";
 fi

copy

@@ -17,8 +17,6 @@ function copy_drive {
         echo "ERROR! 'sh add' only works when the drive is encrypted!" && exit 1;
     fi
 
-    clear_gpg_agent_files;
-
     echo "Clearing ${FILE} ..." && ${RM_BIN} -rf ${FILE}/*;
 
     echo "Copying ${DIR} to ${FILE} ..." && ${CP_BIN} -rp ${DIR}/* ${FILE}/

decrypt

@@ -24,6 +24,8 @@ if is_encrypted; then
     decrypt_private_keys
     decrypt_all_keys
     flush_passphrase_cache
+    clear_gpg_agent_files
+    kill_agent
     untar
 else
     echo "Nothing to decrypt!";

endsession

@@ -6,5 +6,8 @@ if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
 . "$DIR/script/functions"
 
 
+set_gpg_home
+flush_passphrase_cache
 clear_gpg_agent_files
+kill_agent
 ${SSH_ADD_BIN} -D

load

@@ -63,6 +63,8 @@ if is_encrypted; then
     untar
     load
     encrypt_private_keys
+    clear_gpg_agent_files
+    kill_agent
 else
     echo "ERROR! Cannot load unencrypted keys! Run: \"sh encrypt\" first";
 fi

script/functions

@@ -89,17 +89,14 @@ function clear_gpg_agent_files {
     fi
 
     if [ -e "${GPG_HOME_DIR}/S.gpg-agent.browser" ]; then
-        echo "BROWSER!"
         ${UNLINK_BIN} ${GPG_HOME_DIR}/S.gpg-agent.browser
     fi
 
     if [ -e "${GPG_HOME_DIR}/S.gpg-agent.extra" ]; then
-        echo "exrta!"
         ${UNLINK_BIN} ${GPG_HOME_DIR}/S.gpg-agent.extra
     fi
 
     if [ -e "${GPG_HOME_DIR}/S.gpg-agent.ssh" ]; then
-        echo "ssh!"
         ${UNLINK_BIN} ${GPG_HOME_DIR}/S.gpg-agent.ssh
     fi
 }
@@ -115,6 +112,10 @@ function flush_passphrase_cache {
     print_separator
 }
 
+function kill_agent {
+    killall gpg-agent
+}
+
 function untar {
     # Untar files
     for file in *.tar.gz; do ${TAR_BIN} xzvf "${file}" && echo "\nTar: Completed unpacking archive, removing ${file}" && print_separator && ${RM_BIN} "${file}"; done

show

@@ -27,6 +27,8 @@ if is_encrypted; then
     untar
     print_public_key
     encrypt_all_keys
+    clear_gpg_agent_files
+    kill_agent
 else
     echo "ERROR! Cannot show unencrypted keys! Run: \"sh encrypt\" first";
 fi