M contrib/pa-pass → contrib/pa-pass

@@ -6,7 +6,7 @@ # Password dir of pass: export PASSWORD_STORE_DIR=~/.password-store
 # Password dir of pa:   export PA_DIR=~/.local/share/pa/passwords
 
 : "${PASSWORD_STORE_DIR:=$HOME/.password-store}"
-basedir="${XDG_DATA_HOME:=$HOME/.local/share}/pa"
+basedir=${XDG_DATA_HOME:=$HOME/.local/share}/pa
 : "${PA_DIR:=$basedir/passwords}"
 
 # Create pa store if it doesn't exist.
@@ -15,7 +15,7 @@ 
 age=$(command -v age || command -v rage)
 
 find "$PASSWORD_STORE_DIR" -name '*.gpg' | while read -r passfile; do
-    name="$(printf '%s\n' "${passfile#"$PASSWORD_STORE_DIR/"}" | sed 's/\.gpg$//')"
+    name=$(printf '%s\n' "${passfile#"$PASSWORD_STORE_DIR/"}" | sed 's/\.gpg$//')
     mkdir -p "$PA_DIR/$(dirname "$name")"
     gpg2 -d "$passfile" | $age -R "$basedir/recipients" -o "$PA_DIR/$name.age"
     printf '%s\n' "Saved '$name' to the store."

M contrib/pa-rekey → contrib/pa-rekey

@@ -19,7 +19,7 @@ 
 # Restrict permissions of any new files to only the current user.
 umask 077
 
-basedir="${XDG_DATA_HOME:=$HOME/.local/share}/pa"
+basedir=${XDG_DATA_HOME:=$HOME/.local/share}/pa
 : "${PA_DIR:=$basedir/passwords}"
 
 [ "$PA_IDENTITIES" ] && cp "$PA_IDENTITIES" "$basedir/identities.tmp"

M pa → pa

@@ -55,10 +55,10 @@ [ -w /dev/shm ] || tmpdir=/tmp
 
     # Reimplement mktemp here, because
     # mktemp isn't defined in POSIX.
-    suffix="$(rand_chars 10 'A-Za-z0-9')" ||
+    suffix=$(rand_chars 10 'A-Za-z0-9') ||
         die "Couldn't generate random characters"
 
-    tmpfile="$tmpdir/pa.$suffix/$name.age"
+    tmpfile=$tmpdir/pa.$suffix/$name.age
 
     mkdir -p "$(dirname "$tmpfile")" ||
         die "Couldn't create a shared memory dir"
@@ -213,10 +213,10 @@ # so that a name can always be safely displayed.
     shift
     name=$(printf %s "$*" | LC_ALL=C tr -d '[:cntrl:]')
 
-    basedir="${XDG_DATA_HOME:=$HOME/.local/share}/pa"
+    basedir=${XDG_DATA_HOME:=$HOME/.local/share}/pa
     : "${PA_DIR:=$basedir/passwords}"
-    identities_file="$basedir/identities"
-    recipients_file="$basedir/recipients"
+    identities_file=$basedir/identities
+    recipients_file=$basedir/recipients
 
     mkdir -p "$basedir" "$PA_DIR" ||
         die "Couldn't create pa directories"