diff --git a/scripts/windows/coco-dev-setup/batch/config/tips b/scripts/windows/coco-dev-setup/batch/config/tips
new file mode 100755
index 000000000..b15f7d6e2
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/tips
@@ -0,0 +1,5 @@
+ 1) This program is all about automating the setup of the CoCo environment
+ 2) When there is a question, please answer carefull and correct
+ 3) This setup is still in beta and may contain bugs
+ 4) You can report bugs @ 'https://github.com/codecombat/codecombat/issues'
+ 5) Having questions/suggestions? Talk with us on HipChat via CodeCombat.com
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/dev-setup.bat b/scripts/windows/coco-dev-setup/batch/dev-setup.bat
index 4c1412b00..aa838b4ac 100755
--- a/scripts/windows/coco-dev-setup/batch/dev-setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/dev-setup.bat
@@ -18,10 +18,13 @@ IF EXIST "%PROGRAMFILES(X86)%" (
set "ZU-app=utilities\7za.exe"
+:: DEBUG:
+ + DEBUG FLOW OF PROGRAM
+ + DEBUG & GET GIT AUTOMATIC WORKING
+
:: TODO:
-
:: + Write code to install vs if it's not yet installed on users pc
-
+:: + Write Tips...
:: + Write Git Checkout repository code:
:: 1) Let user specify destination
:: 2) do a git clone with the git application
@@ -64,6 +67,14 @@ if "%res%"=="false" (
GOTO:END
)
+:: Tips
+call:log "Before we start the installation, here are some tips:"
+echo.
+
+call:parse_aa_and_draw "config\tips"
+
+call:draw_ss
+
:: Read Language Index
call:parse_file_new "localisation\languages" lang lang_c
@@ -130,9 +141,6 @@ call:log_lw 8
call:install_software_o "git" "%%downloads[1]%%" exe 9
call:draw_dss
call:get_lw word 11
-:: [TODO] Check if that application exists, if not ask again with warning that the path is invalid!!! (SAFETYYYY)
-
-set git_exe="bin\sh.exe"
:: [TODO] Add downloads for windows visual studio ?!
@@ -228,18 +236,11 @@ goto END
call:log_lw_ss 16
call:log_lw_sse 17
- ::Show user the correct steps to execute
- call:log_lw 28
- call:log_lw_prfx 29 " 1) "
- call:log_lw_prfx 30 " "
- call:log_lw_prfx 31 " 2) "
-
- call:draw_dss
- start /WAIT "%git_exe_path%\%git_exe% --login -i"
- call:draw_dss
+ call:set_system_path "%git_exe_path%\bin"
+ call:set_system_path "%git_exe_path%\cmd"
call:user_set_git_repository
-goto git_repo_configuration
+goto git_rep_checkout_auto
:user_set_git_repository
call:get_lw word 32
@@ -253,9 +254,13 @@ goto:eof
call:draw_dss
call:user_set_git_repository
)
- goto git_repo_configuration
+ goto git_rep_checkout_auto
goto:eof
+:git_rep_checkout_auto
+ git clone https://github.com/codecombat/codecombat.git "%git_repository_path%"
+goto:git_repo_configuration
+
:git_repo_configuration
call:log_lw_ss 35
call:log_lw_sse 36
@@ -481,6 +486,10 @@ goto:eof
setx -m %~1 %~2
goto:eof
+:set_system_path
+ set PATH=%PATH%;%~1 /M
+goto:eof
+
:: ============================== EOF ====================================
:END
diff --git a/scripts/windows/coco-dev-setup/batch/git-test.bat b/scripts/windows/coco-dev-setup/batch/git-test.bat
new file mode 100755
index 000000000..8bc51f67f
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/git-test.bat
@@ -0,0 +1,3 @@
+set PATH=%PATH%;C:\Program Files (x86)\Git\bin;C:\Program Files (x86)\Git\cmd /M
+git
+pause
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/en b/scripts/windows/coco-dev-setup/batch/localisation/en
index 2e9c9117d..87a8373da 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/en
+++ b/scripts/windows/coco-dev-setup/batch/localisation/en
@@ -5,11 +5,11 @@ Don't close any windows please, unless specified explicitly.
downloading:
installing:
CodeCombat is safely stored on a git repository.
-Therefore you need a git command-line application.
+Therefore you need a git command-line application (Git-bash).
Examples: git-bash, CygWin, ...
-Do you already have a git command-line application?
+Do you already have git-bash?
Download and Installation cancelled...
-Enter the path to where you installed your Git application
+Enter the path to where you installed Git-bash
Do you already have the latest version of node-js installed?
Do you already have the latest version of ruby installed?
Do you already have the latest version of mongo-db installed?
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/fr b/scripts/windows/coco-dev-setup/batch/localisation/fr
index 4890ab591..ce00fa46f 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/fr
+++ b/scripts/windows/coco-dev-setup/batch/localisation/fr
@@ -5,11 +5,11 @@ Don't close any windows please, unless specified explicitly.
downloading:
installing:
CodeCombat is safely stored on a git repository.
-Therefore you need a git command-line application.
+Therefore you need a git command-line application (Git-bash).
Examples: git-bash, CygWin, ...
-Do you already have a git command-line application?
+Do you already have git-bash?
Download and Installation cancelled...
-Enter the path to where you installed your Git application
+Enter the path to where you installed Git-bash
Do you already have the latest version of node-js installed?
Do you already have the latest version of ruby installed?
Do you already have the latest version of mongo-db installed?
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/nl b/scripts/windows/coco-dev-setup/batch/localisation/nl
index 656baef31..8786cb1bb 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/nl
+++ b/scripts/windows/coco-dev-setup/batch/localisation/nl
@@ -5,11 +5,11 @@ Don't close any windows please, unless specified explicitly.
downloading:
installing:
CodeCombat is safely stored on a git repository.
-Therefore you need a git command-line application.
+Therefore you need a git command-line application (Git-bash).
Examples: git-bash, CygWin, ...
-Do you already have a git command-line application?
+Do you already have git-bash?
Download and Installation cancelled...
-Enter the path to where you installed your Git application
+Enter the path to where you installed Git-bash
Do you already have the latest version of node-js installed?
Do you already have the latest version of ruby installed?
Do you already have the latest version of mongo-db installed?