From fa7876428e6f0e82ce694bac9595d8c9af38c3cd Mon Sep 17 00:00:00 2001
From: Phill Kelley <34226495+Paraphraser@users.noreply.github.com>
Date: Mon, 9 Dec 2024 09:34:40 +1100
Subject: [PATCH] 2024-12-09 install.sh - master branch

This PR follows on from discussion in #651 at
[@6ffm70](https://github.com/SensorsIot/IOTstack/issues/651#issuecomment-2524083300)
post and later.

Previously, the `backups` and `services` folders were only created if
the `~/IOTstack` folder had just been cloned.

As well as "installing", the install script should also function as a
"repair" script so it is preferable to always create the `backups` and
`services` directories and ensure that they, and their contents,
have correct ownership.

Signed-off-by: Phill Kelley <34226495+Paraphraser@users.noreply.github.com>
---
 install.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 29e1af83..d6f22932 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # version - MUST be exactly 7 characters!
-UPDATE="2024v02"
+UPDATE="2024v03"
 
 echo "                                         "
 echo "  _____ ____ _______  _  installer  _    "
@@ -335,7 +335,6 @@ if [ ! -d "$IOTSTACK" ] ; then
 	fi
 	if [ $? -eq 0 -a -d "$IOTSTACK" ] ; then
 		echo "IOTstack cloned successfully into $IOTSTACK"
-		mkdir -p "$IOTSTACK/backups" "$IOTSTACK/services"
 	else
 		echo "Unable to clone IOTstack (likely a git or network error)"
 		handle_exit 1
@@ -344,6 +343,13 @@ else
 	echo -e "\n$IOTSTACK already exists - no need to clone from GitHub"
 fi
 
+# ensure backups and services directories exist and are owned by $USER
+# https://github.com/SensorsIot/IOTstack/issues/651#issuecomment-2525347511
+mkdir -p "$IOTSTACK/backups" "$IOTSTACK/services"
+sudo chown -R "$USER:$USER" "$IOTSTACK/backups" "$IOTSTACK/services"
+# but, if the influxdb backup dir already exists, put it back to root
+[ -d "$IOTSTACK/backups/influxdb" ] && sudo chown -R "root:root" "$IOTSTACK/backups/influxdb"
+
 # initialise docker-compose global environment file with system timezone
 if [ ! -f "$IOTSTACK_ENV" ] || [ $(grep -c "^TZ=" "$IOTSTACK_ENV") -eq 0 ] ; then
 	echo "TZ=$(cat /etc/timezone)" >>"$IOTSTACK_ENV"