Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1364: Minor improvements for `install.sh` question prompts and feedback

bd5508c56b Minor improvements for question prompts and feedback (Kristaps Kaupe)

Pull request description:

  Make both look and act the same, specify default answer, wait only for single character (don't require Enter / Return) and give feedback about choice with Qt GUI (previously you could answer "yyy" and it would mean not to build Qt GUI, as "yyy" != "y").

Top commit has no ACKs.

Tree-SHA512: 4f51633217c791e6d129ec0f95d086fa35b990c0fe1b42d96052109ac88b2a2098e3cea834aed9b1ba99429a1568a25e4efb40fb2bd180bac5f8cdd7d95ac07f
master
Kristaps Kaupe 3 years ago
parent
commit
a8668d7cec
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 11
      install.sh

11
install.sh

@ -172,7 +172,8 @@ dar_deps_install ()
check_skip_build ()
{
if [[ ${reinstall} == false ]] && [[ -d "$1" ]]; then
read -p "Directory ${1} exists. Remove and recreate? (y/n) " q
read -n 1 -p "Directory ${1} exists. Remove and recreate? (y/N) " q
echo ""
if [[ "${q}" =~ Y|y ]]; then
rm -rf "./${1}"
mkdir -p "./${1}"
@ -539,11 +540,15 @@ Options:
done
if [[ ${with_qt} == '' ]]; then
read -p "
read -n 1 -p "
INFO: Joinmarket-Qt for GUI Taker and Tumbler modes is available.
Install Qt dependencies (~160mb) ? [y|n] : "
Install Qt dependencies (~160mb)? (y/N) "
echo ""
if [[ ${REPLY} =~ y|Y ]]; then
echo "Building Qt GUI"
with_qt='1'
else
echo "Not building Qt GUI"
fi
fi
}

Loading…
Cancel
Save