diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea7..bc868e6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
name: Bug report
about: Create a report to help us improve
title: ''
-labels: ''
+labels: 'bug'
assignees: ''
---
@@ -24,15 +24,9 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+ - USB Stick: [e.g. 64 GB SanDisk Cruzer]
+ - RAM: [e.g. 16 GB]
+ - Bails Installation Date: [e.g. Jan 03, 2024]
**Additional context**
Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bbcbbe7..36014cd 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
name: Feature request
about: Suggest an idea for this project
title: ''
-labels: ''
+labels: 'enhancement'
assignees: ''
---
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
deleted file mode 100644
index 113a40a..0000000
--- a/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
- push:
- branches: [ "master" ]
- pull_request:
- branches: [ "master" ]
- schedule:
- - cron: '41 6 * * 2'
-
-jobs:
- analyze:
- name: Analyze (${{ matrix.language }})
- # Runner size impacts CodeQL analysis time. To learn more, please see:
- # - https://gh.io/recommended-hardware-resources-for-running-codeql
- # - https://gh.io/supported-runners-and-hardware-resources
- # - https://gh.io/using-larger-runners (GitHub.com only)
- # Consider using larger runners or machines with greater resources for possible analysis time improvements.
- runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
- timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
- permissions:
- # required for all workflows
- security-events: write
-
- # required to fetch internal or private CodeQL packs
- packages: read
-
- # only required for workflows in private repositories
- actions: read
- contents: read
-
- strategy:
- fail-fast: false
- matrix:
- include:
- - language: python
- build-mode: none
- # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
- # Use `c-cpp` to analyze code written in C, C++ or both
- # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
- # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
- # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
- # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
- # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
- # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
- steps:
- - name: Checkout repository
- uses: actions/checkout@v4
-
- # Initializes the CodeQL tools for scanning.
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v3
- with:
- languages: ${{ matrix.language }}
- build-mode: ${{ matrix.build-mode }}
- # If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
- # Prefix the list here with "+" to use these queries and those in the config file.
-
- # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
- queries: security-extended, security-and-quality
- env:
- CODEQL_EXTRACTOR_PYTHON_DISABLE_AUTOMATIC_VENV_EXCLUDE: 1
-
- # If the analyze step fails for one of the languages you are analyzing with
- # "We were unable to automatically build your code", modify the matrix above
- # to set the build mode to "manual" for that language. Then modify this step
- # to build your code.
- # âšī¸ Command-line programs to run using the OS shell.
- # đ See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
- - if: matrix.build-mode == 'manual'
- shell: bash
- run: |
- echo 'If you are using a "manual" build mode for one or more of the' \
- 'languages you are analyzing, replace this with the commands to build' \
- 'your code, for example:'
- echo ' make bootstrap'
- echo ' make release'
- exit 1
-
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v3
- with:
- category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 9bbf3ba..bf75cb5 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -21,7 +21,7 @@ on:
permissions:
contents: read
# Write permissions for pull-requests are required for using the `comment-summary-in-pr` option, comment out if you aren't using this option
- pull-requests: write
+ #pull-requests: write
jobs:
dependency-review:
@@ -33,7 +33,7 @@ jobs:
uses: actions/dependency-review-action@v4
# Commonly enabled options, see https://github.com/actions/dependency-review-action#configuration-options for all available options.
with:
- comment-summary-in-pr: always
- # fail-on-severity: moderate
+ # comment-summary-in-pr: always
+ fail-on-severity: moderate
# deny-licenses: GPL-1.0-or-later, LGPL-2.0-or-later
# retry-on-snapshot-warnings: true
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 71e126f..3984774 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -5,7 +5,7 @@ on:
branches: [ master ]
paths:
- b
- - bin/*
+ - local/bin/*
- '**.py'
jobs:
shell-lint:
@@ -19,9 +19,9 @@ jobs:
SHELLCHECK_OPTS: -e 2012 -e SC2046 -e SC2086 -e SC2164
with:
ignore_paths: |
- ./bin/bails-wallet
- ./bin/ibd-progress
- ./bin/backupd
+ ./local/bin/bails-wallet
+ ./local/bin/ibd-progress
+ ./local/bin/backupd
# python-lint:
# name: Check Python code
# runs-on: ubuntu-latest
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/Bails.iml b/.idea/Bails.iml
deleted file mode 100644
index 8b8c395..0000000
--- a/.idea/Bails.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index ef2c4da..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index ffb8af4..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index f8d6084..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/b b/b
index b410496..610d398 100755
--- a/b
+++ b/b
@@ -42,4 +42,4 @@ fi
BAILS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export BAILS_DIR
-$BAILS_DIR/bin/install-core
+$BAILS_DIR/local/bin/install-core
diff --git a/bin/.idea/bin.iml b/bin/.idea/bin.iml
deleted file mode 100644
index d0876a7..0000000
--- a/bin/.idea/bin.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/.idea/inspectionProfiles/profiles_settings.xml b/bin/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/bin/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/.idea/modules.xml b/bin/.idea/modules.xml
deleted file mode 100644
index 9f585cd..0000000
--- a/bin/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/config/.idea/config.iml b/config/.idea/config.iml
deleted file mode 100644
index d0876a7..0000000
--- a/config/.idea/config.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/config/.idea/inspectionProfiles/profiles_settings.xml b/config/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/config/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/config/.idea/modules.xml b/config/.idea/modules.xml
deleted file mode 100644
index e8b6c6b..0000000
--- a/config/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/.idea/docs.iml b/docs/.idea/docs.iml
deleted file mode 100644
index d0876a7..0000000
--- a/docs/.idea/docs.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/.idea/inspectionProfiles/profiles_settings.xml b/docs/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/docs/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/.idea/modules.xml b/docs/.idea/modules.xml
deleted file mode 100644
index 6049cfe..0000000
--- a/docs/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lib/.idea/.gitignore b/lib/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/lib/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/lib/.idea/codeStyles/codeStyleConfig.xml b/lib/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/lib/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/lib/.idea/inspectionProfiles/profiles_settings.xml b/lib/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/lib/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lib/.idea/lib.iml b/lib/.idea/lib.iml
deleted file mode 100644
index 4c41137..0000000
--- a/lib/.idea/lib.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lib/.idea/misc.xml b/lib/.idea/misc.xml
deleted file mode 100644
index dc9ea49..0000000
--- a/lib/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/lib/.idea/modules.xml b/lib/.idea/modules.xml
deleted file mode 100644
index 5e88056..0000000
--- a/lib/.idea/modules.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lib/.idea/vcs.xml b/lib/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/lib/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bin/backupd b/local/bin/backupd
similarity index 100%
rename from bin/backupd
rename to local/bin/backupd
diff --git a/bin/bails-backup b/local/bin/bails-backup
similarity index 100%
rename from bin/bails-backup
rename to local/bin/bails-backup
diff --git a/bin/bails-cloner b/local/bin/bails-cloner
similarity index 100%
rename from bin/bails-cloner
rename to local/bin/bails-cloner
diff --git a/bin/bails-menu b/local/bin/bails-menu
similarity index 100%
rename from bin/bails-menu
rename to local/bin/bails-menu
diff --git a/bin/bails-wallet b/local/bin/bails-wallet
similarity index 100%
rename from bin/bails-wallet
rename to local/bin/bails-wallet
diff --git a/bin/bitcoin-qt-wrapper b/local/bin/bitcoin-qt-wrapper
similarity index 100%
rename from bin/bitcoin-qt-wrapper
rename to local/bin/bitcoin-qt-wrapper
diff --git a/bin/chainstate-preload b/local/bin/chainstate-preload
similarity index 100%
rename from bin/chainstate-preload
rename to local/bin/chainstate-preload
diff --git a/bin/decrypt-vault b/local/bin/decrypt-vault
similarity index 100%
rename from bin/decrypt-vault
rename to local/bin/decrypt-vault
diff --git a/bin/ibd-progress b/local/bin/ibd-progress
similarity index 100%
rename from bin/ibd-progress
rename to local/bin/ibd-progress
diff --git a/bin/install-core b/local/bin/install-core
similarity index 92%
rename from bin/install-core
rename to local/bin/install-core
index cb1a844..584ad8d 100755
--- a/bin/install-core
+++ b/local/bin/install-core
@@ -29,12 +29,16 @@
export SOURCE='/live/persistence/TailsData_unlocked'
# Set environment variables
-export PATH="${PATH}:${HOME}/.local/bin"
+export PATH="$HOME/.local/bin:$PATH"
export WAYLAND_DISPLAY="" # Needed for zenity dialogs to have window icon
export ICON="--window-icon=$HOME/.local/share/icons/bails128.png"
export DATA_DIR=$SOURCE/Persistent/.bitcoin
export DOTFILES=$SOURCE/dotfiles
export LOCAL_DIR=$DOTFILES/.local
+export XDG_CONFIG_HOME=$DOTFILES/.config
+export XDG_CACHE_HOME=$DOTFILES/.cache
+export XDG_DATA_HOME=$LOCAL_DIR/share
+export TMPDIR=$XDG_RUNTIME_DIR
readonly DOWNLOAD_DIR=$HOME/.local/share/bitcoin-core
@@ -113,7 +117,7 @@ set -m
old_versions=$(ls -d $DOWNLOAD_DIR/bitcoin-core-* | wc --lines)
# Installs Bails to tmpfs
-rsync --recursive $BAILS_DIR/{bin,lib,share,state} $HOME/.local/
+rsync --recursive $BAILS_DIR/.local $HOME
# Create the destination directory if it doesn't exist
mkdir -p "$DOWNLOAD_DIR"
@@ -138,7 +142,7 @@ clear -x
persistent-setup || systemctl reboot
# Installs Bails to Persistent Storage
-rsync --recursive --remove-source-files $BAILS_DIR/{bin,lib,share,state} $LOCAL_DIR
+rsync -r --remove-source-files $BAILS_DIR/.{local,config} $DOTFILES
link_dotfiles # Clobbers the tmpfs installation
printf '\033]2;Getting Bitcoin Core signatures...\a'
@@ -176,11 +180,11 @@ if (( old_versions != versions )) || [ ! -f $LOCAL_DIR/bin/bitcoind ]; then
fi
fi
-# Bring chainparams.cpp download to foreground then set assumed chainstate & blockchain size
+# Bring chainparams.cpp download to foreground, set assumed chainstate & blockchain size, configure prune
ps -p $get_size &>/dev/null && fg %$(jobs -l | grep $get_size | cut -f1 -d' ' | tr -c -d '[:digit:]')
assumed_chain_state_size=$(grep --max-count=1 m_assumed_chain_state_size $DOWNLOAD_DIR/chainparams.cpp | sed 's/[^0-9]*//g')
assumed_blockchain_size=$(grep --max-count=1 m_assumed_blockchain_size $DOWNLOAD_DIR/chainparams.cpp | sed 's/[^0-9]*//g')
-
+# Calculate space available for block file storage
space=$(($(df --output=size $SOURCE | tail -1) / 1024 - ( assumed_chain_state_size + 10 ) * 1024))
prune_MiB=$((space > 1907 ? space : 1907 ))
# Disable pruning if USB stick is large enough
@@ -191,7 +195,7 @@ printf '\033]2;Downloading Bitcoin Core...\a'
ps -p $core_download &>/dev/null && fg %$(jobs -l | grep $core_download | cut -f1 -d' ' | tr -c -d '[:digit:]')
# Move completed download to persistent storage
-rsync --remove-source-files --recursive $DOWNLOAD_DIR $LOCAL_DIR/share/
+rsync --remove-source-files --recursive $DOWNLOAD_DIR $XDG_DATA_HOME
link_dotfiles
# Verify download integrity # TODO make sure they can actually retry the download by re-running the script, that everything gets skipped that needs to be skipped.
@@ -228,30 +232,27 @@ ln --symbolic --force /tmp/debug.log $DATA_DIR/debug.log # links debug.log to tm
ln --symbolic $DATA_DIR $HOME &>/dev/null # This can't be persisted by dotfiles so an autostart remakes it.
# Change mime association from electrum to bitcoin core
-sed 's/electrum/bitcoin-qt/g' /usr/share/applications/mimeinfo.cache >$LOCAL_DIR/share/applications/mimeinfo.cache
+sed 's/electrum/bitcoin-qt/g' /usr/share/applications/mimeinfo.cache >$XDG_DATA_HOME/applications/mimeinfo.cache
# create application shortcuts
#TODO for L1
-# Create config to persist gui settings and autostart
-rsync --remove-source-files -recursive "$BAILS_DIR"/config/ $DOTFILES/.config
-
# Enable proxies for Tor and prune
[ -f $DATA_DIR/settings.json ] || echo '{
"onion": "127.0.0.1:9050",
"proxy": "127.0.0.1:9050",
- "prune": "'$prune_MiB'"
+ "prune": "'$prune_MiB'",
+ "dbcache": "450"
}' > $DATA_DIR/settings.json
# Cleanup
-rm -Rf ${BAILS_DIR:?}/{bin,lib,share,state,config} "$DOWNLOAD_DIR"/{download,*.tmp,wget-log*}
-rsync -r --remove-source-files $BAILS_DIR/ $LOCAL_DIR/share/bails
-rm -rf $BAILS_DIR
+rm -Rf "$DOWNLOAD_DIR"/{download,*.tmp,wget-log*} $XDG_DATA_HOME/bails
+mv $BAILS_DIR $XDG_DATA_HOME/bails
link_dotfiles
-# Update $PATH enironment variable to include new user bin
-# shellcheck source=/dev/null
-. $HOME/.profile
+# # Update $PATH enironment variable to include new user bin
+# # shellcheck source=/dev/null
+# . $HOME/.profile
if [ -z "$(ls -A $DATA_DIR/wallets)" ]; then
bails-wallet
@@ -265,15 +266,13 @@ dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell o
# Display info about IBD, keeping Tails private and reading material
if ((versions < 2)); then
(
- # Temporarily change $HOME directory make Bail's datadir the default
+ # Temporarily change $HOME directory make Bails's datadir the default
HOME+=/Persistent
- # Symlink .config and .cache to dotfiles so changed GUI settings persist
- ln -s $DOTFILES/.{config,cache} $HOME &>/dev/null
zenity -notification "Use the default data directory."
bitcoin-qt-wrapper -choosedatadir -prune=$prune_MiB
link_dotfiles
) &
- # TODO Make it easier to read. and dont run on reinstalls!
+ # TODO Make it easier to read. and Confirm it doesn't run on reinstalls!
sleep 5 # wait so the dialogs open on top of bitcoin core.
zenity --info --title='Setup almost complete' --icon-name=bails128 "$ICON" --width=552 --text='Bitcoin Core will begin syncing the block chain automatically.\nMake sure no one messes with the PC.\n\nTo lock the screen for privacy, press â+L (â+L or â+L)\n\nIt is safer to exit Bitcoin Core (Ctrl+Q), shutdown Tails and take your Bails USB stick with you or store it in a safe place than leave Tails running unattended where people you distrust could tamper with it.\n\nIf you want to learn more about using Tails safely read the documentation.\n\nAnother excellent read to improve your physical and digital security tactics is the security in-a-box website.'
else
diff --git a/bin/persistent-setup b/local/bin/persistent-setup
similarity index 100%
rename from bin/persistent-setup
rename to local/bin/persistent-setup
diff --git a/bin/spaced-repetition b/local/bin/spaced-repetition
similarity index 97%
rename from bin/spaced-repetition
rename to local/bin/spaced-repetition
index 7f885df..a192aa9 100755
--- a/bin/spaced-repetition
+++ b/local/bin/spaced-repetition
@@ -26,7 +26,7 @@
# Function to prompt for passphrase using pinentry-gnome3
get_passphrase() {
- passphrase="$(echo -e "SETPROMPT $enter Persistent Storage passphrase:\nGETPIN" | pinentry-gnome3 2>&1 | grep D | cut -c3-)"
+ passphrase="$(echo -e "SETPROMPT $enter Persistent Storage passphrase:\nGETPIN" | pinentry-gnome3 --timeout 99999 2>&1 | grep D | cut -c3-)"
}
check_passphrase() {
diff --git a/lib/python3.11/site-packages/bails/create_vault.py b/local/lib/python3.11/site-packages/bails/create_vault.py
similarity index 100%
rename from lib/python3.11/site-packages/bails/create_vault.py
rename to local/lib/python3.11/site-packages/bails/create_vault.py
diff --git a/lib/python3.11/site-packages/bails/passphrase.py b/local/lib/python3.11/site-packages/bails/passphrase.py
similarity index 100%
rename from lib/python3.11/site-packages/bails/passphrase.py
rename to local/lib/python3.11/site-packages/bails/passphrase.py
diff --git a/lib/python3.11/site-packages/bails/set_pass.py b/local/lib/python3.11/site-packages/bails/set_pass.py
similarity index 100%
rename from lib/python3.11/site-packages/bails/set_pass.py
rename to local/lib/python3.11/site-packages/bails/set_pass.py
diff --git a/lib/python3.11/site-packages/codex32/ms32.py b/local/lib/python3.11/site-packages/codex32/ms32.py
similarity index 100%
rename from lib/python3.11/site-packages/codex32/ms32.py
rename to local/lib/python3.11/site-packages/codex32/ms32.py
diff --git a/lib/python3.11/site-packages/codex32/naive_ms32_ecc.py b/local/lib/python3.11/site-packages/codex32/naive_ms32_ecc.py
similarity index 100%
rename from lib/python3.11/site-packages/codex32/naive_ms32_ecc.py
rename to local/lib/python3.11/site-packages/codex32/naive_ms32_ecc.py
diff --git a/share/applications/bails.desktop b/local/share/applications/bails.desktop
similarity index 100%
rename from share/applications/bails.desktop
rename to local/share/applications/bails.desktop
diff --git a/share/applications/bitcoin-qt-wrapper.desktop b/local/share/applications/bitcoin-qt-wrapper.desktop
similarity index 100%
rename from share/applications/bitcoin-qt-wrapper.desktop
rename to local/share/applications/bitcoin-qt-wrapper.desktop
diff --git a/share/applications/bitcoin-qt.desktop b/local/share/applications/bitcoin-qt.desktop
similarity index 100%
rename from share/applications/bitcoin-qt.desktop
rename to local/share/applications/bitcoin-qt.desktop
diff --git a/share/applications/decrypt-vault.desktop b/local/share/applications/decrypt-vault.desktop
similarity index 100%
rename from share/applications/decrypt-vault.desktop
rename to local/share/applications/decrypt-vault.desktop
diff --git a/share/icons/bails128.png b/local/share/icons/bails128.png
similarity index 100%
rename from share/icons/bails128.png
rename to local/share/icons/bails128.png
diff --git a/share/icons/bitcoin128.png b/local/share/icons/bitcoin128.png
similarity index 100%
rename from share/icons/bitcoin128.png
rename to local/share/icons/bitcoin128.png
diff --git a/share/icons/die.png b/local/share/icons/die.png
similarity index 100%
rename from share/icons/die.png
rename to local/share/icons/die.png
diff --git a/state/placeholder.txt b/local/state/placeholder.txt
similarity index 100%
rename from state/placeholder.txt
rename to local/state/placeholder.txt
diff --git a/share/.idea/inspectionProfiles/profiles_settings.xml b/share/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/share/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/share/.idea/modules.xml b/share/.idea/modules.xml
deleted file mode 100644
index e00634d..0000000
--- a/share/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/share/.idea/share.iml b/share/.idea/share.iml
deleted file mode 100644
index d0876a7..0000000
--- a/share/.idea/share.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/state/.idea/inspectionProfiles/profiles_settings.xml b/state/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/state/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/state/.idea/modules.xml b/state/.idea/modules.xml
deleted file mode 100644
index c177629..0000000
--- a/state/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/state/.idea/state.iml b/state/.idea/state.iml
deleted file mode 100644
index d0876a7..0000000
--- a/state/.idea/state.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file