diff --git a/scripts/windows/coco-dev-setup/batch/localisation/en.coco b/scripts/windows/coco-dev-setup/batch/localisation/en.coco index 4a85ed172..1cd237fb5 100755 --- a/scripts/windows/coco-dev-setup/batch/localisation/en.coco +++ b/scripts/windows/coco-dev-setup/batch/localisation/en.coco @@ -40,6 +40,7 @@ bashp64=Git bash is by default installed at 'C:\Program Files (x86)\Git'. bashp32=Git bash is by default installed at 'C:\Program Files\Git'. bashq=Please enter the full path where git bash is installed or just press enter if it's in the default location + ssh=Do you want to checkout the repository via ssh? [error] path=That path already exists, are you sure you want to overwrite it? exist=That path doesn't exist. Please try again... diff --git a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco index ba51e2974..5f646c6fb 100755 --- a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco +++ b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco @@ -40,6 +40,7 @@ bashp64=Git bash is normaal geinstalleerd in 'C:\Program Files (x86)\Git'. bashp32=Git bash is normaal geinstalleerd in 'C:\Program Files\Git'. bashq=Geef alsjeblieft het volledige pad op van Git Bash of druk gewoon op enter indien je het pad niet gewijzigd heeft + ssh=Wil je het git project downloaden via ssh? [error] path=Dat pad bestaat al, ben je zeker dat je het wil overschrijven? exist=Dat pad bestaat niet, probeer alsjeblieft opnieuw... diff --git a/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat index c03eac4d1..ce845d98a 100755 --- a/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat +++ b/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat @@ -90,6 +90,7 @@ goto:eof goto:get_git_path ) else ( rmdir /s /q %repository_path% + goto:git_checkout ) ) else ( goto:git_checkout @@ -99,7 +100,19 @@ goto:eof :git_checkout call print_dashed_seperator set "git_app_path=%git_bash_path%\bin\git.exe" - "%git_app_path%" clone https://github.com/codecombat/codecombat.git "%repository_path%" + + call get_local_text github-process-ssh + call ask_question "!github_process_ssh!" + + if "%result%"=="true" ( + call get_config github_ssh + "%git_app_path%" clone "!github_ssh!" "%repository_path%" + echo no + ) else ( + call get_config github_url + "%git_app_path%" clone "!github_url!" "%repository_path%" + ) + goto:exit_git_setup goto:eof