Move Umbrel installation to ~/umbrel (#78)

README.md

@@ -70,7 +70,7 @@ Other Raspbian-related stuff can be found in [Raspbian's documentation](https://
 
 **Post bootup checks**
 
-For building an API (or scripting), look in `/home/umbrel/statuses` for the following files
+For building an API (or scripting), look in `/home/umbrel/umbrel/statuses` for the following files
 
 - `disk-partitioned`: meaning the disk is partitioned.
 - `service-configured`: meaning the umbrel system bootup service is configured and running.

stage2/00-sys-tweaks/files/rc.local

@@ -18,7 +18,7 @@ if [ "$_IP" ]; then
     printf "My IP address is %s\n" "$_IP"
 fi
 
-UMBREL_BOOT_SCRIPT=/home/umbrel/scripts/umbrel-os/boot
+UMBREL_BOOT_SCRIPT=/home/umbrel/umbrel/scripts/umbrel-os/boot
 
 # Check for statuses directory
 if [ -x "$UMBREL_BOOT_SCRIPT" ]; then

stage2/05-docker-compose/01-run.sh

@@ -5,7 +5,8 @@ echo "Installing docker-compose from pip3, and also setting up the box folder st
 
 on_chroot << EOF
 pip3 install docker-compose
-cd /home/${FIRST_USER_NAME}
+mkdir /home/${FIRST_USER_NAME}/umbrel
+cd /home/${FIRST_USER_NAME}/umbrel
 curl -L https://github.com/getumbrel/umbrel/archive/v${UMBREL_VERSION}.tar.gz | tar -xz --strip-components=1
 chown -R ${FIRST_USER_NAME}:${FIRST_USER_NAME} /home/${FIRST_USER_NAME}
 EOF

stage2/05-docker-compose/files/umbrel

@@ -16,7 +16,7 @@ set -e
 NAME="umbrel"
 DESCRIPTION="Umbrel service"
 SCRIPTNAME=/etc/init.d/$NAME
-UMBREL_ROOT=/home/umbrel
+UMBREL_ROOT=/home/umbrel/umbrel
 
 case "$1" in
   	start)

stage2/07-umbrel-details/files/umbrel-details

@@ -81,7 +81,7 @@ def run(command):
 
 def main():
     timeout = 30
-    tor_hostname_file = "/home/umbrel/tor/data/web/hostname"
+    tor_hostname_file = "/home/umbrel/umbrel/tor/data/web/hostname"
     tor_hostname = read_file_when_available(tor_hostname_file, timeout)
 
     ip = run(['hostname', '-I']).split(" ")[0]