From 1ec36f44bca57a7aeb779012f2844c81b36c3f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lien=20Sell=C3=A6g?= <jorgen@guut.org>
Date: Wed, 1 Jun 2016 14:39:54 +0200
Subject: [PATCH] fix source directory path for appveyor

---
 appveyor.yml  | 6 +++---
 ci/execute.sh | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5b6ef8f..9fed3a7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,8 +8,8 @@ before_build:
   - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh pacman
   - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh git
   - C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade
-  - C:\msys64\usr\bin\bash -lc "C:/projects/jucipp/ci/update_ci.sh"
+  - C:\msys64\usr\bin\bash -lc "$(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/update_ci.sh"
 
 build_script:    
-  - C:\msys64\usr\bin\bash -lc "script=compile C:/projects/jucipp/ci/execute.sh"
-  - C:\msys64\usr\bin\bash -lc "script=compile make_command='CTEST_OUTPUT_ON_FAILURE=1 make test' C:/projects/jucipp/ci/execute.sh"
+  - C:\msys64\usr\bin\bash -lc "script=compile $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
+  - C:\msys64\usr\bin\bash -lc "script=compile make_command='CTEST_OUTPUT_ON_FAILURE=1 make test' $(cygpath ${APPVEYOR_BUILD_FOLDER})/ci/execute.sh"
diff --git a/ci/execute.sh b/ci/execute.sh
index 9670d97..18df1d6 100755
--- a/ci/execute.sh
+++ b/ci/execute.sh
@@ -29,12 +29,13 @@ function osx () {
 
 function windows () {
   export PATH="/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem:/c/WINDOWS/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl"
-  cd "C:/projects" || (echo "Error changing directory"; return 1)
+  bf=$(cygpath ${APPVEYOR_BUILD_FOLDER})
+  cd "$bf" || (echo "Error changing directory"; return 1)
   if [ "${script}" == "clean" ]; then
-    sudo rm "C:/projects/jucipp/build" -rf
+    sudo rm "./build" -rf
     return 0
   fi
-  sh -c "C:/projects/jucipp/ci/${script}.sh"
+  sh -c "${bf}/ci/${script}.sh"
 }