From c1e673ce1aadd9c9b1449d3be0fb297434da42c2 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Mon, 11 May 2020 00:03:56 +0100
Subject: [PATCH] Unify path conversion functions

---
 CI/before_script.msvc.sh | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 2427f2be11..2346203706 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -20,6 +20,23 @@ esac
 
 set -euo pipefail
 
+function windowsPathAsUnix {
+	if command -v cygpath >/dev/null 2>&1; then
+		cygpath -u $1
+	else
+		echo "$1" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,"
+	fi
+}
+
+function unixPathAsWindows {
+	if command -v cygpath >/dev/null 2>&1; then
+		cygpath -w $1
+	else
+		echo "$1" | sed "s,^/\([^/]\)/,\\1:/," | sed "s,/,\\\\,g"
+
+	fi
+}
+
 APPVEYOR=${APPVEYOR:-}
 CI=${CI:-}
 STEP=${STEP:-}
@@ -132,7 +149,7 @@ fi
 if [ -z $APPVEYOR ]; then
 	echo "Running prebuild outside of Appveyor."
 
-	DIR=$(echo "$0" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
+	DIR=$(windowsPathAsUnix "$0")
 	cd $(dirname "$DIR")/..
 else
 	echo "Running prebuild in Appveyor."
@@ -487,7 +504,7 @@ fi
 		# We work around this by installing to root of the current working drive and then move it to our deps
 		# get the current working drive's root, we'll install to that temporarily
 		CWD_DRIVE_ROOT="$(powershell -command '(get-location).Drive.Root')Boost_temp"
-		CWD_DRIVE_ROOT_BASH=$(echo "$CWD_DRIVE_ROOT" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
+		CWD_DRIVE_ROOT_BASH=$(windowsPathAsUnix "$CWD_DRIVE_ROOT")
 		if [ -d CWD_DRIVE_ROOT_BASH ]; then
 			printf "Cannot continue, ${CWD_DRIVE_ROOT_BASH} aka ${CWD_DRIVE_ROOT} already exists. Please remove before re-running. ";
 			exit 1;
@@ -688,7 +705,7 @@ fi
 		else
 			SUFFIX=""
 		fi
-		DIR=$(echo "${QT_SDK}" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
+		DIR=$(windowsPathAsUnix "${QT_SDK}")
 		add_runtime_dlls "${DIR}/bin/Qt5"{Core,Gui,Network,OpenGL,Widgets}${SUFFIX}.dll
 		add_qt_platform_dlls "${DIR}/plugins/platforms/qwindows${SUFFIX}.dll"
 		echo Done.