From 3393477268a8e0e8edf76e11d36225d6114edf65 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Sat, 2 Sep 2017 11:53:33 +0200
Subject: nc-automount: improve links

---
 etc/nextcloudpi-config.d/nc-automount.sh      | 9 ++++++---
 etc/nextcloudpi-config.d/nc-notify-updates.sh | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/etc/nextcloudpi-config.d/nc-automount.sh b/etc/nextcloudpi-config.d/nc-automount.sh
index 18fba5b9..fb593aed 100644
--- a/etc/nextcloudpi-config.d/nc-automount.sh
+++ b/etc/nextcloudpi-config.d/nc-automount.sh
@@ -71,11 +71,14 @@ ls -d /media/* &>/dev/null && {
   # create links
   i=0
   for d in `ls -d /media/*`; do
-    [ $i -eq 0 ] && \
-      ln -sT "$d" /media/USBdrive   || \
-      ln -sT "$d" /media/USBdrive$i
+    if [ $i -eq 0 ]; then
+      mountpoint -q "$d" && ln -sT "$d" /media/USBdrive
+    else
+      mountpoint -q "$d" && ln -sT "$d" /media/USBdrive$i
+    fi
     i=$(( i + 1 ))
   done
+
 }
 EOF
   chmod +x /usr/local/etc/nc-automount-links
diff --git a/etc/nextcloudpi-config.d/nc-notify-updates.sh b/etc/nextcloudpi-config.d/nc-notify-updates.sh
index f96436cb..5ebd90c4 100644
--- a/etc/nextcloudpi-config.d/nc-notify-updates.sh
+++ b/etc/nextcloudpi-config.d/nc-notify-updates.sh
@@ -63,7 +63,7 @@ VERFILE=/usr/local/etc/ncp-version
 LATEST=/var/run/.ncp-latest-version
 NOTIFIED=/var/run/.ncp-version-notified
 
-test -e \$LATEST  || exit 0;
+test -e \$LATEST || exit 0;
 ncp-test-updates || { echo "NextCloudPi up to date"; exit 0; }
 
 test -e \$NOTIFIED && [[ "\$( cat \$LATEST )" == "\$( cat \$NOTIFIED )" ]] && { 
-- 
cgit v1.2.3