Merge pull request #382 from piotrkwiecinski/paths-with-spaces

compose/bin/copyfromcontainer

@@ -3,13 +3,13 @@
 
 REAL_SRC=$(cd -P "src" && pwd)
 if [ "$1" == "--all" ]; then
-  docker cp $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/./ $REAL_SRC/
+  docker cp $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/./ "$REAL_SRC/"
   echo "Completed copying all files from container to host"
 else
   if [ -f "$1" ] ; then
-    docker cp $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/$1 $REAL_SRC/$1
+    docker cp $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/"$1" "$REAL_SRC/$1"
   else
-    docker cp $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/$1 $REAL_SRC/$(dirname $1)
+    docker cp $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/"$1" "$REAL_SRC/$(dirname "$1")"
   fi
   echo "Completed copying $1 from container to host"
 fi

compose/bin/copytocontainer

@@ -3,17 +3,17 @@
 
 REAL_SRC=$(cd -P "src" && pwd)
 if [ "$1" == "--all" ]; then
-  docker cp $REAL_SRC/./ $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/
+  docker cp "$REAL_SRC/./" $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/
   echo "Completed copying all files from host to container"
   bin/fixowns
   bin/fixperms
 else
   if [ -f "$REAL_SRC/$1" ]; then
-    docker cp $REAL_SRC/$1 $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/$1
+    docker cp "$REAL_SRC/${1}" $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/"$1"
   else
-    docker cp $REAL_SRC/$1 $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/$(dirname $1)
+    docker cp "$REAL_SRC/${1}" $(docker-compose ps -q phpfpm|awk '{print $1}'):/var/www/html/"$(dirname "$1")"
   fi
   echo "Completed copying $1 from host to container"
-  bin/fixowns $1
-  bin/fixperms $1
+  bin/fixowns "$1"
+  bin/fixperms "$1"
 fi

compose/bin/fixowns

@@ -4,7 +4,7 @@ echo "Correcting filesystem ownerships..."
 if [ -z "$1" ]; then
   bin/rootnotty chown -R app:app /var/www/
 else
-  bin/rootnotty chown -R app:app /var/www/html/$1
+  bin/rootnotty chown -R app:app /var/www/html/"$1"
 fi
 
 echo "Filesystem ownerships corrected."