mirror of
https://github.com/openoms/joininbox.git
synced 2026-08-20 13:28:07 +02:00
fix install scripts
This commit is contained in:
parent
9488ff86a4
commit
f795cb6bcb
3 changed files with 10 additions and 8 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ""
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue