diff --git a/pom.xml b/pom.xml index 07c863b..993256b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ fr.yodamad.svn2git svn-2-git - 2.2.1 + 2.2.2 jar Svn 2 GitLab diff --git a/src/main/kotlin/fr/yodamad/svn2git/functions/StringFunctions.kt b/src/main/kotlin/fr/yodamad/svn2git/functions/StringFunctions.kt index eabf7e1..b1dca9a 100644 --- a/src/main/kotlin/fr/yodamad/svn2git/functions/StringFunctions.kt +++ b/src/main/kotlin/fr/yodamad/svn2git/functions/StringFunctions.kt @@ -18,4 +18,4 @@ fun String.encode(): String = encode(this, "UTF-8") fun String.decode(): String = decode(this, "UTF-8") fun String.gitFormat(): String = this.decode().replace(" ", "_") -fun String.escape(): String = this.replace("\\", "\\\\").replace("$", """\$""") +fun String.escape(): String = if (isWindows) this else this.replace("\\", "\\\\").replace("$", """\$""") diff --git a/src/main/resources/templates/scripts/win/git-command.ps1.hbs b/src/main/resources/templates/scripts/win/git-command.ps1.hbs index 6f3d43e..09604de 100644 --- a/src/main/resources/templates/scripts/win/git-command.ps1.hbs +++ b/src/main/resources/templates/scripts/win/git-command.ps1.hbs @@ -1 +1 @@ -{{{ workingDir }}}\\git-svn-clone.ps1 -repoUrl {{{ svnUrl }}} -username {{{ svnUser }}} -password {{{ svnPassword }}} -debugging -outputStdout -destination "{{{ workingDir }}}" -certificateAcceptResponse t -cloneOptions \"{{{ cloneOptions }}}\" +{{{ workingDir }}}\\git-svn-clone.ps1 -repoUrl {{{ svnUrl }}} -username {{{ svnUser }}} -password {{{ svnPassword }}} -debugging -outputStdout -destination "{{{ workingDir }}}" -certificateAcceptResponse t -cloneOptions "{{{ cloneOptions }}}"