From 7d18bbb88b79c23c7e920eaecac75df77c38a02a Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Tue, 31 Dec 2019 01:27:01 +0100
Subject: Fix deployment directory cleanup

---
 .travis-ci.sh | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to '.travis-ci.sh')

diff --git a/.travis-ci.sh b/.travis-ci.sh
index a50398b..1475dea 100644
--- a/.travis-ci.sh
+++ b/.travis-ci.sh
@@ -76,7 +76,7 @@ elif [[ $TASK = 'windows' ]]; then
   travis_fold start "make_windows"
   make windows;
   travis_fold end "make_windows"
-  
+  travis_fold start "deploy_windows"
   if [ "$(git describe)" == "$(git describe --abbrev=0)" ]; then
     mkdir ./deployment
     mkdir ./deployment/backends
@@ -88,28 +88,27 @@ elif [[ $TASK = 'windows' ]]; then
     cp -r ./configs ./deployment/
     cd ./deployment
     zip -r "./midimonster-$(git describe)-windows.zip" "./"
-    rm -v !(*.zip)
+    find . ! -iname '*.zip' -delete
   fi
-
-
+  travis_fold end "deploy_windows"
 else
   # Otherwise compile as normal
   travis_fold start "make"
   make full;
-
-if [ "$(git describe)" == "$(git describe --abbrev=0)" ]; then
-  mkdir ./deployment
-  mkdir ./deployment/backends
-  mkdir ./deployment/docs
-  cp ./midimonster ./deployment/
-  cp ./backends/*.so ./deployment/backends/
-  cp ./monster.cfg ./deployment/monster.cfg
-  cp ./backends/*.md ./deployment/docs/
-  cp -r ./configs ./deployment/
-  cd ./deployment
-  tar czf "midimonster-$(git describe)-$TRAVIS_OS_NAME.tgz" *
-  rm -v !("*.tgz")
-  fi
-
   travis_fold end "make"
-fi
\ No newline at end of file
+  travis_fold start "deploy_unix"
+  if [ "$(git describe)" == "$(git describe --abbrev=0)" ]; then
+   mkdir ./deployment
+   mkdir ./deployment/backends
+   mkdir ./deployment/docs
+   cp ./midimonster ./deployment/
+   cp ./backends/*.so ./deployment/backends/
+   cp ./monster.cfg ./deployment/monster.cfg
+   cp ./backends/*.md ./deployment/docs/
+   cp -r ./configs ./deployment/
+   cd ./deployment
+   tar czf "midimonster-$(git describe)-$TRAVIS_OS_NAME.tgz" *
+   find . ! -iname '*.tgz' -delete
+  fi
+  travis_fold end "deploy_unix"
+fi
-- 
cgit v1.2.3