Use URL variables and small enhancements

b

@@ -27,52 +27,62 @@
 export VERSION='v0.7.0-alpha'
 export WAYLAND_DISPLAY="" # Needed for zenity dialogs to have window icon
 export ICON="--window-icon=$HOME/.local/share/icons/bails128.png"
-DOTFILES='/live/persistence/TailsData_unlocked/dotfiles'
+export DOTFILES='/live/persistence/TailsData_unlocked/dotfiles'
 BAILS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-if [ "$1" == "--help" ]; then
-  echo "Bails Version: $VERSION"
+if [ "$1" == "--version" ]; then
+  echo "Bails version $VERSION"
+  exit 0
 elif ! grep 'NAME="Tails"' /etc/os-release > /dev/null; then # Check for Tails OS.
     echo "
     YOU MUST RUN THIS SCRIPT IN TAILS OS!
     "
     read -rp "PRESS ENTER TO EXIT SCRIPT, AND RUN AGAIN FROM TAILS. "
-    exit 1
 elif [[ $(id -u) = "0" ]]; then # Check for root.
     echo "
   YOU SHOULD NOT RUN THIS SCRIPT AS ROOT!
   "
     read -rp "PRESS ENTER TO EXIT SCRIPT, AND RUN AGAIN AS $USER. "
-    exit 1
 else
   # Install Bails to tmpfs
-  rsync --recursive "$BAILS_DIR/bails/" "$HOME"
+  rsync -rvh "$BAILS_DIR/bails/" "$HOME"
   # shellcheck disable=SC1091
-  . "$HOME"/.profile
-  if [ -z "$1" ]; then # Don't update or install core if ran with a parameter
-    install-core
-  else
-    persistent-setup
-  fi &
-
-  until /usr/local/lib/tpscli is-unlocked && \
-    /usr/local/lib/tpscli is-active Dotfiles && \
-    [ -d "$DOTFILES" ] && [ -w "$DOTFILES" ]; do
-      sleep 1
-  done
-  # Install Bails to Persistent Storage
-  rsync -r --remove-source-files "$BAILS_DIR"/bails/ $DOTFILES
-  rsync --remove-source-files --recursive "$BAILS_DIR"/ $DOTFILES/.local/share/bails
-  rm -rf "$BAILS_DIR"
-
-  # shellcheck disable=SC1090
-  . ~/.profile
-  link-dotfiles
-
+  . "$HOME/.profile"
+  (
+    persistent-setup &
+    until /usr/local/lib/tpscli is-unlocked && \
+      /usr/local/lib/tpscli is-active Dotfiles && \
+      [ -d "$DOTFILES" ] && [ -w "$DOTFILES" ]; do
+        sleep 1
+    done
+    # Install Bails to Persistent Storage
+    rsync -rvh --remove-source-files "$BAILS_DIR/bails/" $DOTFILES
+    rsync -rvh --remove-source-files "$BAILS_DIR"/ $DOTFILES/.local/share/bails
+    rm -rvf "$BAILS_DIR"
+    link-dotfiles
+  ) & # Run persistent setup in background
+  # shellcheck disable=SC1091
+  [ -z "$1" ] && . install-core # Don't update core if ran with a parameter
   wait
   if [ -z "$1" ]; then
     zenity --info --title="Bails install successful" --text="Bails $VERSION has been installed." "$ICON" --icon-name=bails128
+    # Exit by killing controlling terminal
+    echo "Bails installation complete! 
+
+Closing this window in 30 seconds, press any key to abort.
+"
+for ((i = 30; i >= 1; i--)); do
+    echo -n "$i "
+    read -r -t 1 -n 1 && { printf '\n%s\n' "Aborted."; exit 0; }
+done
+    echo "
+Closing terminal window..."
+    sleep 3
+    PARENT_PID=$(ps -o ppid= -p $$)
+    kill -9 "$PARENT_PID"
   else
     zenity --info --title="Bails update successful" --text="Bails has been updated to $VERSION." "$ICON" --icon-name=bails128
-  fi &
+  fi
+  exit 0
 fi
+exit 1

bails/.local/bin/backupd

@@ -90,4 +90,3 @@ $BIN_DIR/backupd $((2*rescan_time))
 # expire the USB that is Actually Oldest, not the one with the most adjusted age.
 # the number of up-to-date backups is displayed to the user in bails-menu, whenever one expires, before and after updating/creating a backup and constantly when 0 remain updated.
 # TODO make sure every backup gets marked expired after creating new descriptor wallets or encrypting existing ones.
-

bails/.local/bin/bails-menu

@@ -32,9 +32,6 @@ export DOTFILES="/live/persistence/TailsData_unlocked/dotfiles"
 export LOCAL_DIR="$DOTFILES/.local/"
 export DATA_DIR="/live/persistence/TailsData_unlocked/Persistent/.bitcoin"
 
-# Fetch installed version
-# shellcheck disable=SC1091
-. $LOCAL_DIR/share/bails/b --help
 
 onlynet_onion() {
     zenity --question --title='Network Privacy' --text='Bails offers two settings for connecting to the Bitcoin network. By default, Bitcoin Core connects to both clearnet and Tor (onion) peers, providing a balance between usability and privacy.
@@ -93,7 +90,7 @@ case "$response2" in
     "Donate") xdg-open bitcoin: ;; # FIXME: change address
     "Report a Bug") tor-browser https://github.com/BenWestgate/Bails/issues ;;
     "About") zenity --info --window-icon="$LOCAL_DIR/share/icons/bails128.png" \
-        --title="About Bails" --icon-name=bails128 --text="Bails version $VERSION\n\nCopyright © 2024 Ben Westgate\n\nPlease contribute if you find Bails useful. Visit <a href='https://twitter.com/BenWestgate_'>https://twitter.com/BenWestgate_</a> for further information about the software.\nThe source code is available from <a href='https://github.com/BenWestgate/Bails'>https://github.com/BenWestgate/Bails</a>.\n\nThis is experimental software.\nDistributed under the MIT software license, see the accompanying file COPYING or <a href='https://opensource.org/licenses/MIT'>https://opensource.org/licenses/MIT</a>"; bails-menu ;;
+        --title="About Bails" --icon-name=bails128 --text="$($LOCAL_DIR/share/bails/b --version)\n\nCopyright © 2024 Ben Westgate\n\nPlease contribute if you find Bails useful. Visit <a href='https://twitter.com/BenWestgate_'>https://twitter.com/BenWestgate_</a> for further information about the software.\nThe source code is available from <a href='https://github.com/BenWestgate/Bails'>https://github.com/BenWestgate/Bails</a>.\n\nThis is experimental software.\nDistributed under the MIT software license, see the accompanying file COPYING or <a href='https://opensource.org/licenses/MIT'>https://opensource.org/licenses/MIT</a>"; bails-menu ;;
     "Online Help") xdg-open https://bitcoin-core-on-tails.slack.com/ && \
         xdg-open https://t.me/bails_support ;;
     "Update Bitcoin Core") gnome-terminal --title="Updating Bitcoin Core..." --hide-menubar \

bails/.local/bin/bails-wallet

@@ -138,7 +138,7 @@ display_confirm() {
         ((x > 3)) && backup=" ${x}th Backup"
         progress="($backups_made of $locations)"
         unset share
-        until [ "$codex32_string" == "$share,," ]; do
+        until [ "$codex32_string" == "{$share,,}" ]; do
             zenity --title="Create new a seed backup $progress" --text="Write this codex32 $string legibly:\n\n<big><big>$displayed</big></big>" --info --icon-name=org.gnome.TextEditor --no-wrap $ICON
             choice="Create a new seed"
             input_share

bails/.local/bin/decrypt-vault

@@ -54,8 +54,8 @@ for _ in 1 2 3; do
     fi
 done
 
-if (($(lsblk $loop_device | wc -l) < 3)); then
-    udisksctl loop-delete -b $loop_device
+if (($(lsblk "$loop_device" | wc -l) < 3)); then
+    udisksctl loop-delete -b "$loop_device"
 fi
 [ -z "$wallet" ] && exit 0
 exit 1