From f3f9e3043d53344bc2a3a8312fa98e63ab0fd683 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Thu, 4 Jan 2018 14:58:01 -0600
Subject: [PATCH] grr not all files/directories cleaning

---
 .travis/deploy_script.sh              |  3 ++-
 Makefile                              | 14 +++++++-------
 storage/framework/cache/.gitignore    |  2 --
 storage/framework/sessions/.gitignore |  2 --
 storage/framework/views/.gitignore    |  2 --
 5 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100755 storage/framework/cache/.gitignore
 delete mode 100755 storage/framework/sessions/.gitignore
 delete mode 100755 storage/framework/views/.gitignore

diff --git a/.travis/deploy_script.sh b/.travis/deploy_script.sh
index a526ada0..7c551dd9 100755
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -20,9 +20,10 @@ if [ "$TRAVIS" = "true" ]; then
     cd $TRAVIS_BUILD_DIR
 
     make clean
+    echo ""
 
     rm -rf env.php
-    find ./vendor -type d -name ".git" | xargs rm -rf
+    find ./vendor -type d -name ".git" -print0 | xargs rm -rf
 
     # Remove any development files
     rm -rf .sass-cache
diff --git a/Makefile b/Makefile
index 9fe492a9..80571a3b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,13 +16,13 @@ clean:
 	@php artisan route:clear
 	@php artisan config:clear
 	@php artisan view:clear
-	@find bootstrap/cache -type f -not -name '.gitignore' -print0 -delete
-	@find storage/app/public -type f -not -name '.gitignore' -print0 -delete
-	@find storage/app -type f -not -name '.gitignore' -not -name public -print0 -delete
-	@find storage/framework/cache -type f -not -name '.gitignore' -print0 -delete
-	@find storage/framework/sessions -type f -not -name '.gitignore' -print0 -delete
-	@find storage/framework/views -type f -not -name '.gitignore' -print0 -delete
-	@find storage/logs -type f -not -name '.gitignore' -print0 -delete
+	@find bootstrap/cache -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf
+	@find storage/app/public -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf
+	@find storage/app -type f -not -name '.gitignore' -not -name public -print0 | xargs -0 rm -rf
+	@find storage/framework/cache -type f -or -type d -not -name '.gitignore' -print0 | xargs -0 rm -rf
+	@find storage/framework/sessions -type f -or -type d -not -name '.gitignore' -print0 | xargs -0 rm -rf
+	@find storage/framework/views -type f -or -type d -not -name '.gitignore' -print0 | xargs -0 rm -rf
+	@find storage/logs -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf
 
 .PHONY: clean-routes
 clean-routes:
diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore
deleted file mode 100755
index d6b7ef32..00000000
--- a/storage/framework/cache/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore
deleted file mode 100755
index d6b7ef32..00000000
--- a/storage/framework/sessions/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore
deleted file mode 100755
index d6b7ef32..00000000
--- a/storage/framework/views/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore