From 4458723f48f9dc30ef766591a68f3260fce0e8fd Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Wed, 8 Apr 2020 21:44:56 +0200
Subject: [PATCH] fix rsync exclude rules (#7)

---
 apache/entrypoint.sh       | 4 ++--
 apache/upgrade.exclude     | 2 +-
 docker-entrypoint.sh       | 4 ++--
 fpm-alpine/entrypoint.sh   | 4 ++--
 fpm-alpine/upgrade.exclude | 2 +-
 fpm/entrypoint.sh          | 4 ++--
 fpm/upgrade.exclude        | 2 +-
 upgrade.exclude            | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apache/entrypoint.sh b/apache/entrypoint.sh
index 3209783..d0bce7c 100755
--- a/apache/entrypoint.sh
+++ b/apache/entrypoint.sh
@@ -42,11 +42,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     else
         rsync_options="-rlD"
     fi
-    rsync $rsync_options --delete --exclude-from=/usr/local/share/upgrade.exclude $MONICASRC/ $MONICADIR
+    rsync $rsync_options --delete --exclude-from=/usr/local/share/upgrade.exclude $MONICASRC/ $MONICADIR/
 
     for dir in storage; do
         if [ ! -d "$MONICADIR/$dir" ] || directory_empty "$MONICADIR/$dir"; then
-            rsync $rsync_options --include "/$dir/" --exclude '/*' $MONICASRC/ $MONICADIR
+            rsync $rsync_options --include "/$dir/" --exclude '/*' $MONICASRC/ $MONICADIR/
         fi
     done
     echo "...done!"
diff --git a/apache/upgrade.exclude b/apache/upgrade.exclude
index fa780e2..dbca33e 100644
--- a/apache/upgrade.exclude
+++ b/apache/upgrade.exclude
@@ -1 +1 @@
-storage
+/storage
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 3209783..d0bce7c 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -42,11 +42,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     else
         rsync_options="-rlD"
     fi
-    rsync $rsync_options --delete --exclude-from=/usr/local/share/upgrade.exclude $MONICASRC/ $MONICADIR
+    rsync $rsync_options --delete --exclude-from=/usr/local/share/upgrade.exclude $MONICASRC/ $MONICADIR/
 
     for dir in storage; do
         if [ ! -d "$MONICADIR/$dir" ] || directory_empty "$MONICADIR/$dir"; then
-            rsync $rsync_options --include "/$dir/" --exclude '/*' $MONICASRC/ $MONICADIR
+            rsync $rsync_options --include "/$dir/" --exclude '/*' $MONICASRC/ $MONICADIR/
         fi
     done
     echo "...done!"
diff --git a/fpm-alpine/entrypoint.sh b/fpm-alpine/entrypoint.sh
index 3209783..d0bce7c 100755
--- a/fpm-alpine/entrypoint.sh
+++ b/fpm-alpine/entrypoint.sh
@@ -42,11 +42,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     else
         rsync_options="-rlD"
     fi
-    rsync $rsync_options --delete --exclude-from=/usr/local/share/upgrade.exclude $MONICASRC/ $MONICADIR
+    rsync $rsync_options --delete --exclude-from=/usr/local/share/upgrade.exclude $MONICASRC/ $MONICADIR/
 
     for dir in storage; do
         if [ ! -d "$MONICADIR/$dir" ] || directory_empty "$MONICADIR/$dir"; then
-            rsync $rsync_options --include "/$dir/" --exclude '/*' $MONICASRC/ $MONICADIR
+            rsync $rsync_options --include "/$dir/" --exclude '/*' $MONICASRC/ $MONICADIR/
         fi
     done
     echo "...done!"
diff --git a/fpm-alpine/upgrade.exclude b/fpm-alpine/upgrade.exclude
index fa780e2..dbca33e 100644
--- a/fpm-alpine/upgrade.exclude
+++ b/fpm-alpine/upgrade.exclude
@@ -1 +1 @@
-storage
+/storage
diff --git a/fpm/entrypoint.sh b/fpm/entrypoint.sh
index 3209783..d0bce7c 100755
--- a/fpm/entrypoint.sh
+++ b/fpm/entrypoint.sh
@@ -42,11 +42,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     else
         rsync_options="-rlD"
     fi
-    rsync $rsync_options --delete --exclude-from=/usr/local/share/upgrade.exclude $MONICASRC/ $MONICADIR
+    rsync $rsync_options --delete --exclude-from=/usr/local/share/upgrade.exclude $MONICASRC/ $MONICADIR/
 
     for dir in storage; do
         if [ ! -d "$MONICADIR/$dir" ] || directory_empty "$MONICADIR/$dir"; then
-            rsync $rsync_options --include "/$dir/" --exclude '/*' $MONICASRC/ $MONICADIR
+            rsync $rsync_options --include "/$dir/" --exclude '/*' $MONICASRC/ $MONICADIR/
         fi
     done
     echo "...done!"
diff --git a/fpm/upgrade.exclude b/fpm/upgrade.exclude
index fa780e2..dbca33e 100644
--- a/fpm/upgrade.exclude
+++ b/fpm/upgrade.exclude
@@ -1 +1 @@
-storage
+/storage
diff --git a/upgrade.exclude b/upgrade.exclude
index fa780e2..dbca33e 100644
--- a/upgrade.exclude
+++ b/upgrade.exclude
@@ -1 +1 @@
-storage
+/storage