add verbosity to git pull, remove old guix.sigs, clean up builder-key…

…s loop

bails/.local/bin/install-core

@@ -96,7 +96,7 @@ search_key() {
 
 get_guix_sigs() (
     if cd guix.sigs 2>/dev/null; then
-        git pull # Update guix.sigs
+        git pull -v # Update guix.sigs
     else
         git clone https://github.com/bitcoin-core/guix.sigs --depth=1
     fi 
@@ -132,7 +132,8 @@ retry_on_fail wget -cxnH --cut-dirs=1 "$BITCOIN_CORE_DOMAIN/bin/bitcoin-core-$VE
 printf '\033]2;Getting Bitcoin Core builder keys...\a'
 retry_on_fail get_guix_sigs
 
-(cd "guix.sigs/$VER" || exit 1; for name in *; do gpg --show-keys "$DOWNLOAD_DIR/guix.sigs/builder-keys/$name.gpg"; done) > builder-keys
+for dir in guix.sigs/*/; do [ "${dir#*/}" == "$VER" ] && break; rm -rf "$dir"; done
+for name in guix.sigs/"$VER"/*; do gpg --show-keys "${name/"$VER"/builder-keys}.gpg"; done > builder-keys
 if OLD_VER=$(bitcoind --version 2>/dev/null); then # Refresh keys if updating
     action=update
     printf '\033]2;Updating all keys from keyserver...\a'

bails/.local/bin/wrapped

@@ -29,7 +29,7 @@ export ICON="--window-icon=$HOME/.local/share/icons/bails128.png"
 export DATA_DIR=/live/persistence/TailsData_unlocked/Persistent/.bitcoin
 
 # shellcheck disable=SC1090
-. ~/.profile
+. "/home/$USER/.profile"
 persistent-setup # Checks needed persistent features are on.
 # Symlink at default datadir to our custom datadir
 ln -s /live/persistence/TailsData_unlocked/Persistent/.* ~