X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fuccpass.git;a=blobdiff_plain;f=uccpass;h=f3998037ed7156480c579499a494c1533aaa516a;hp=62c42e3f7ef1b30eec709943a748468839550e3f;hb=c9f8d31bcaa8c3cfc71996e9e9ae3b8fd5d5c773;hpb=cec09c3133b150ad81bd66cee4620020cae95fc7

diff --git a/uccpass b/uccpass
index 62c42e3..f399803 100755
--- a/uccpass
+++ b/uccpass
@@ -26,10 +26,10 @@
 init () {
     # Check for pass subcommand
     if ! type pass >/dev/null; then
-        echo "$0: can't find the pass(1) command, is it installed correctly?"
+        echo "uccpass: can't find the pass(1) command, is it installed correctly?"
     fi
     if ! type gpg2 >/dev/null; then
-        echo "$0: can't find gpg2(1), is it installed correctly?"
+        echo "uccpass: can't find gpg2(1), is it installed correctly?"
     fi
 
     UCCPASS_ROOT="/home/wheel/bin/uccpass"
@@ -37,10 +37,14 @@ init () {
     export PASSWORD_STORE_DIR="$UCCPASS_ROOT/store"
     export PASSWORD_STORE_UMASK=007
 
+    USER=`whoami`
     export GIT_AUTHOR_EMAIL="$USER+wheel@ucc.gu.uwa.edu.au"
     export GIT_AUTHOR_NAME="`getent passwd $USER | cut -d: -f5`"
 
     export GPG_TTY=`tty`
+    export PASSWORD_STORE_GPG_OPTS="--trust-model always"
+
+    export PATH=$UCCPASS_ROOT/pass/bin:$PATH
 
     if [ -n "$UCCPASS_DEBUG" ]; then set -x; fi
 }
@@ -76,7 +80,7 @@ refresh_keys () {
 }
 
 new_user_setup () {
-    echo " >  Setting you up for $0"
+    echo " >  Setting you up for uccpass"
 
     # Set up an agent
     echo -n " >> Checking for running GPG agent... "
@@ -85,7 +89,7 @@ new_user_setup () {
         echo "not found."
         USER_SHELL=`basename $SHELL`
         if echo $USER_SHELL | egrep -q 'zsh|bash|fish'; then
-            echo " [!] $0 can install an password caching agent into your shell initialisation files."
+            echo " [!] uccpass can install an password caching agent into your shell initialisation files."
             echo -n " [?] Do you want to do so? [Y/n] " 
             read install_agent
             case $install_agent in
@@ -124,10 +128,10 @@ new_user_setup () {
 
     # Add to .gpg-id
     echo -n " >> Adding your key to the access list... "
-    if grep -qF "$KEY_FINGERPRINT" $PASSWORD_STORE_DIR/.gpg-id; then
+    if grep -qF "<$GIT_AUTHOR_EMAIL>" $PASSWORD_STORE_DIR/.gpg-id; then
         echo "already present!"
     else
-        echo "$KEY_FINGERPRINT" >> $PASSWORD_STORE_DIR/.gpg-id
+        echo "<$GIT_AUTHOR_EMAIL>" >> $PASSWORD_STORE_DIR/.gpg-id
         echo "ok."
     fi
 
@@ -141,8 +145,8 @@ new_user_setup () {
     fi
 
     # Done!
-    echo " > $0 setup complete."
-    echo " [!] Ask someone with existing access to the password store to run \`$0 reload\`."
+    echo " > uccpass setup complete."
+    echo " [!] Ask someone with existing access to the password store to run \`uccpass reload\`."
 }
 
 init
@@ -161,7 +165,7 @@ case "$1" in
         ;;
     help|--help)
         command pass $@
-        echo "$0 also supports the following commands:"
+        echo "uccpass also supports the following commands:"
         echo "setup: generate a new key and insert it into the password store"
         echo "reload: re-encrypt the password store"
         ;;