Updated ci setup with cleanup step

Author: Simon Hofmann

.travis.yml

@@ -60,6 +60,8 @@ matrix:
 
 before_install:
   - chmod +x ./ci/$BUILD_TASK/$BUILD_TASK.sh;
+  - chmod +x ./ci/clean.sh
+  - bash ./ci/clean.sh
 
 install: true
 

appveyor.yml

@@ -42,7 +42,7 @@ environment:
       DISABLE_ASYNC_HOOKS_TEST: 1
 
 install:
-  - IF EXIST c:\opencv-prebuilt RMDIR /S /Q c:\opencv-prebuilt
+  - IF EXIST c:\opencv-prebuilt rd /s /q c:\opencv-prebuilt
   # - cmd: choco install OpenCV -y -version %OPENCV_VERSION%
   - IF EXIST c:\tools\opencv* CD c:\tools\opencv*
   - SET OPENCV_INCLUDE_DIR=%CD%\build\include

ci/clean.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/sh
+set -e
+
+if [[ "$TRAVIS_OS_NAME" == "linux" ]] || [[ "$TRAVIS_OS_NAME" == "osx" ]]
+then
+    dirs=(
+    /opt/opencv-prebuilt
+    /usr/local/opt/opencv-prebuilt
+    )
+
+    for dir in ${dirs[*]}
+    do
+        if [ -d $dir ]
+        then
+            echo "Removing '$dir'"
+            rm -rf $dir
+        fi
+    done
+fi
+

ci/prebuild/prebuild.sh

@@ -1,19 +1,7 @@
 #!/bin/sh
-if [[ "$TRAVIS_OS_NAME" == "linux" ]] || [[ "$TRAVIS_OS_NAME" == "osx" ]];
-then
-    dirs=(
-    /opt/opencv-prebuilt
-    /usr/local/opt/opencv-prebuilt
-    )
-
-    for dir in ${dirs[*]}; do if [ -d $dir ]; then rm -rf $dir; fi; done
-fi
-if [[ "$TRAVIS_OS_NAME" == "windows" ]];
-then
-    for dir in ${dirs[*]}; do if [ -d $dir ]; then rm -rf $dir; fi; done
-fi
-
 cd ../../ &&\
 npm install --unsafe-perm &&\
+cd test
 npm test
+cd -
 npm run prebuild -- --tag-prefix "" -u $GITHUB_TOKEN;