From eef3379b9342a0024b4bf36ed70fec8d29a80fb9 Mon Sep 17 00:00:00 2001
From: Mayank Chhabra <mayankchhabra9@gmail.com>
Date: Fri, 31 Jul 2020 20:18:35 +0530
Subject: [PATCH] Move configure.sh to scripts/configure (#71)

---
 README.md                             |  8 ++++----
 configure-box.sh => scripts/configure | 14 ++++++++++++--
 scripts/umbrel-os/boot                |  4 ++--
 3 files changed, 18 insertions(+), 8 deletions(-)
 rename configure-box.sh => scripts/configure (95%)

diff --git a/README.md b/README.md
index 542d993..289d38d 100644
--- a/README.md
+++ b/README.md
@@ -83,14 +83,14 @@ curl -L https://github.com/getumbrel/umbrel/archive/v0.1.5-beta.tar.gz | tar -xz
 ### Step 2. Configure
 
 ```bash
-# To run Umbrel on mainnet, run:
-./configure-box.sh
+# To configure Umbrel for mainnet, run:
+./scripts/configure
 
 # For testnet, run:
-TESTNET=1 ./configure-box.sh
+TESTNET=1 ./scripts/configure
 
 # For regtest, run:
-REGTEST=1 ./configure-box.sh
+REGTEST=1 ./scripts/configure
 ```
 
 ### Step 3. Run Umbrel
diff --git a/configure-box.sh b/scripts/configure
similarity index 95%
rename from configure-box.sh
rename to scripts/configure
index f9f5aa8..f41486f 100755
--- a/configure-box.sh
+++ b/scripts/configure
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
@@ -27,6 +28,15 @@ check_dependencies () {
 
 check_dependencies wget docker docker-compose
 
+UMBREL_ROOT="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))/.."
+
+if [[ ! -d "$UMBREL_ROOT" ]]; then
+  echo "Root dir does not exist '$UMBREL_ROOT'"
+  exit 1
+fi
+
+cd "$UMBREL_ROOT"
+
 echo "Start box configuration"
 echo "Installing RPCAuth.py and configuring secrets"
 cd bin/
@@ -107,5 +117,5 @@ rm -fr README.md
 rm -fr NETWORKING.md
 rm -fr CONTRIBUTING.md
 rm -fr LICENSE
-rm -fr configure-box.sh
+
 echo "Box Configuration complete"
diff --git a/scripts/umbrel-os/boot b/scripts/umbrel-os/boot
index 27eeae1..25c2bc5 100755
--- a/scripts/umbrel-os/boot
+++ b/scripts/umbrel-os/boot
@@ -24,10 +24,10 @@ if [ ! -f "$UMBREL_ROOT"/statuses/disk-partitioned ]; then
 fi
 
 if [ ! -f "$UMBREL_ROOT"/statuses/service-configured ]; then
-    if [ -f "$UMBREL_ROOT"/configure-box.sh ]; then
+    if [ -f "$UMBREL_ROOT"/scripts/configure ]; then
         echo "Running configuration script"
         cd "$UMBREL_ROOT"
-        ./configure-box.sh || exit 1
+        ./scripts/configure || exit 1
         # Marking this as done so we don't do configuration again
         touch "$UMBREL_ROOT"/statuses/service-configured
         chown -R umbrel.umbrel "$UMBREL_ROOT"/statuses/service-configured