From ee08398aedc3186cb8c831e77fbc319065b8b4a1 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Thu, 4 Jan 2018 15:22:32 -0600 Subject: [PATCH] move -mindepth options --- .travis/deploy_script.sh | 6 +++--- Makefile | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis/deploy_script.sh b/.travis/deploy_script.sh index 25bfbb08..4e8cf42c 100755 --- a/.travis/deploy_script.sh +++ b/.travis/deploy_script.sh @@ -29,8 +29,8 @@ if [ "$TRAVIS" = "true" ]; then find ./vendor -type d -name ".git" -print0 | xargs rm -rf # clear any app specific stuff that might have been loaded in - find storage/app/public -not -name '.gitignore' -print0 | xargs -0 rm -rf - find storage/app -not -name '.gitignore' -not -name public -print0 | xargs -0 rm -rf + find storage/app/public -mindepth 1 -not -name '.gitignore' -print0 | xargs -0 rm -rf + find storage/app -mindepth 1 -not -name '.gitignore' -not -name public -print0 | xargs -0 rm -rf # Remove any development files rm -rf .sass-cache @@ -46,7 +46,7 @@ if [ "$TRAVIS" = "true" ]; then echo "creating tarball" cd /tmp - tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR/../ phpvms + tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR/../ phpvms #git archive --format=tar.gz --prefix=phpvms/ --output=test.tar.gz HEAD echo "running rsync" diff --git a/Makefile b/Makefile index 8bfd208e..852e98c8 100644 --- a/Makefile +++ b/Makefile @@ -18,11 +18,11 @@ clean: @php artisan view:clear @find bootstrap/cache -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf - @find storage/framework/cache/ -not -name '.gitignore' -mindepth 1 -print0 | xargs -0 rm -rf - @find storage/framework/sessions/ -type f -not -name '.gitignore' -mindepth 1 -print0 | xargs -0 rm -rf - @find storage/framework/views/ -not -name '.gitignore' -mindepth 1 -print0 | xargs -0 rm -rf + @find storage/framework/cache/ -mindepth 1 -not -name '.gitignore' -print0 | xargs -0 rm -rf + @find storage/framework/sessions/ -mindepth 1 -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf + @find storage/framework/views/ -mindepth 1 -not -name '.gitignore' -print0 | xargs -0 rm -rf - @find storage/logs -type f -not -name '.gitignore' -print0 | xargs -0 rm -rf + @find storage/logs -mindepth 1 -not -name '.gitignore' -print0 | xargs -0 rm -rf .PHONY: clean-routes clean-routes: