From f7aebc691a8de02e107783c9644acd0aa594b22f Mon Sep 17 00:00:00 2001
From: Alexandre CATTEAU <alexandre.catteau@gmail.com>
Date: Wed, 16 Mar 2022 17:28:32 +0100
Subject: [PATCH] Change the way volumes are defined by user

---
 .gitignore           |  3 ++-
 install.sh           |  8 +++++---
 mounts.conf.template | 18 +++++++-----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07ca624..aa640e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-mounts.conf
+mounts.conf.d/*
+
diff --git a/install.sh b/install.sh
index 9a04391..8bbe63b 100755
--- a/install.sh
+++ b/install.sh
@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 
-source "$(dirname "$0")/mounts.conf"
-
 echo "Copying Systemd units to system directory..."
-for mount in $mounts; do
+for f in $(dirname "$0")/mounts.conf.d/*.conf; do
+  if [ ! -e "$f" ]; then
+    continue
+  fi
+  source $f
   mountfile=$(echo ${mount[target]} | sed -e "s:/:-:g")
   mountfile=${mountfile:1}.mount
   sudo cp $(dirname "$0")/template.mount /etc/systemd/system/$mountfile
diff --git a/mounts.conf.template b/mounts.conf.template
index 0b329dd..2042b2c 100644
--- a/mounts.conf.template
+++ b/mounts.conf.template
@@ -1,13 +1,9 @@
 #!/usr/bin/env bash
-# Copy this file as mounts.conf, and add your volumes.
+# Copy this file in mounts.conf.d as <something>.conf, and add your volume settings.
+# You may repeat this for all your mounts
 
-declare -A mount1
-mount1[mapper]='' # As in /dev/mapper/<?>
-mount1[target]='' # Mount point (absolute path)
-mount1[friendly]='' # Optional friendly name for unit file Description
-mount1[autolock]=0 # Set to 1 to enable autolock
-
-mounts=(
-  $mount1
-  #$mount2...
-)
+declare -A mount
+mount[mapper]='' # As in /dev/mapper/<?>
+mount[target]='' # Mount point (absolute path)
+mount[friendly]='' # Optional friendly name for unit file Description
+mount[autolock]=0 # Set to 1 to enable autolock