From f795cb6bcbf4f26ac5500ceac3f70e3bf9be2bfe Mon Sep 17 00:00:00 2001
From: openoms <oms@tuta.io>
Date: Tue, 28 Jan 2020 18:39:42 +0000
Subject: [PATCH] fix install scripts

---
 build_joininbox.sh            | 7 ++++---
 scripts/install.joinmarket.sh | 4 ++--
 scripts/wallet.import.sh      | 7 ++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build_joininbox.sh b/build_joininbox.sh
index eae74b1..8a6dd7c 100644
--- a/build_joininbox.sh
+++ b/build_joininbox.sh
@@ -45,9 +45,10 @@ adduser --disabled-password --gecos "" joinin
 
 echo "*** Clone the joininbox repo and copy the scripts ***"
 cd /home/joinin
-git clone https://github.com/openoms/joininbox.git
-cp ./joininbox/scripts/* /home/joinin/
-cp ./joininbox/scripts/.dialogrc /home/joinin/
+sudo -u joinin git clone https://github.com/openoms/joininbox.git
+sudo -u joinin cp ./joininbox/scripts/* /home/joinin/
+sudo -u joinin cp ./joininbox/scripts/.* /home/joinin/ 2>/dev/null
+
 chmod +x /home/joinin/*.sh
 chmod +x /home/joinin/*.py
 
diff --git a/scripts/install.joinmarket.sh b/scripts/install.joinmarket.sh
index 2b67a38..8ab34e8 100644
--- a/scripts/install.joinmarket.sh
+++ b/scripts/install.joinmarket.sh
@@ -3,11 +3,11 @@
 # install joinmarket
 if [ ! -f "/home/joinin/joinmarket-clientserver/jmvenv/bin/activate" ] ; then
     cd /home/joinin
-    git clone https://github.com/JoinMarket-Org/joinmarket-clientserver.git
+    sudo -u joinin git clone https://github.com/JoinMarket-Org/joinmarket-clientserver.git
     cd joinmarket-clientserver
     # latest release: https://github.com/JoinMarket-Orgjoinmarket-clientserver/releases
     git reset --hard v0.6.1
-    joinin ./install.sh --without-qt
+    sudo -u joinin ./install.sh --without-qt
 else
     echo "JoinMarket is already installed"
     echo ""
diff --git a/scripts/wallet.import.sh b/scripts/wallet.import.sh
index 3791efd..801a36a 100644
--- a/scripts/wallet.import.sh
+++ b/scripts/wallet.import.sh
@@ -22,11 +22,12 @@ if [ ! -f "/home/joinin/joinmarket-clientserver/jmvenv/bin/activate" ]; then
   response=$?
   echo "response(${response})"
   if [ "${response}" = "1" ]; then
-    echo "OK - startin JoinMarket installation"
-    sudo ./install.joinmarket.sh            errorOnInstall=$?
+    echo "OK - starting JoinMarket installation"
+    ./install.joinmarket.sh
+    errorOnInstall=$?
     if [ ${errorOnInstall} -eq 0 ]; then
       dialog --title "Installed JoinMarket" \
-        --msgbox "\nContinue from the menu or the command line " 7 56
+        --msgbox "\nContinue from the menu or use the command line " 7 56
     else 
       DIALOGRC=.dialogrc.onerror dialog --title "Error during install" \
         --msgbox "\nPlease search or report at:\n https://github.com/openoms/joininbox/issues" 7 56