From df38915b63f92bd32dbbf5101269e70ed41621b3 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 1 Aug 2012 15:51:14 +0200
Subject: [PATCH 1/5] Simplify windows install

Don't download node.exe and jquery on install
Check node version
Exit on error
---
 bin/installOnWindows.bat | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat
index 159c517f9..d16333e04 100644
--- a/bin/installOnWindows.bat
+++ b/bin/installOnWindows.bat
@@ -1,22 +1,15 @@
 @echo off
-set NODE_VERSION=0.8.1
-set JQUERY_VERSION=1.7
 
 :: change directory to etherpad-lite root
-cd bin
-cd ..
+cd /D "%~dp0\.."
 
-echo _
-echo Updating node...
-curl -lo bin\node.exe http://nodejs.org/dist/v%NODE_VERSION%/node.exe
+echo Checking node version...
+set check_version="if(['6','8'].indexOf(process.version.split('.')[1].toString()) === -1) { console.log('You are running a wrong version of Node. Etherpad Lite requires v0.6.x or v0.8.x'); process.exit(1) }"
+cmd /C node -e %check_version% || exit /B 1
 
 echo _
 echo Installing etherpad-lite and dependencies...
-cmd /C npm install src/
-
-echo _
-echo Updating jquery...
-curl -lo "node_modules\ep_etherpad-lite\static\js\jquery.min.js" "http://code.jquery.com/jquery-%JQUERY_VERSION%.min.js"
+cmd /C npm install src/ || exit /B 1
 
 echo _
 echo Copying custom templates...
@@ -27,12 +20,16 @@ FOR %%f IN (index pad timeslider) DO (
 )
 
 echo _
-echo Clearing cache.
+echo Clearing cache...
 del /S var\minified*
 
 echo _
 echo Setting up settings.json...
-IF NOT EXIST settings.json copy settings.json.template settings.json
+IF NOT EXIST settings.json (
+  echo Can't find settings.json.
+  echo Copying settings.json.template...
+  cmd /C copy settings.json.template settings.json || exit /B 1
+)
 
 echo _
 echo Installed Etherpad-lite!
\ No newline at end of file

From 4b59a18f2394c8597ceed42beb079c046854fc7a Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 1 Aug 2012 15:52:12 +0200
Subject: [PATCH 2/5] Update start.bat

---
 start.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.bat b/start.bat
index 624102228..0f6fc5535 100644
--- a/start.bat
+++ b/start.bat
@@ -1 +1 @@
-bin\node.exe node_modules\ep_etherpad-lite\node\server.js
\ No newline at end of file
+node node_modules\ep_etherpad-lite\node\server.js
\ No newline at end of file

From 3076ad918056fba7f3eb9a3cc4073af403b1e523 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 1 Aug 2012 23:37:39 +0200
Subject: [PATCH 3/5] Exit on install if node is not installed.

---
 bin/installOnWindows.bat | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat
index d16333e04..c46ac0340 100644
--- a/bin/installOnWindows.bat
+++ b/bin/installOnWindows.bat
@@ -3,6 +3,10 @@
 :: change directory to etherpad-lite root
 cd /D "%~dp0\.."
 
+:: Is node installed?
+cmd /C node -e "" || ( echo "Please install node.js ( http://nodejs.org )" && exit /B 1 )
+
+echo _
 echo Checking node version...
 set check_version="if(['6','8'].indexOf(process.version.split('.')[1].toString()) === -1) { console.log('You are running a wrong version of Node. Etherpad Lite requires v0.6.x or v0.8.x'); process.exit(1) }"
 cmd /C node -e %check_version% || exit /B 1

From 2d941bf31dcc10c31109e16a1411072d22a7a042 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 1 Aug 2012 23:42:03 +0200
Subject: [PATCH 4/5] Fix buildForWindows

---
 bin/buildForWindows.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh
index 99f9bb08a..7486ccf56 100755
--- a/bin/buildForWindows.sh
+++ b/bin/buildForWindows.sh
@@ -50,7 +50,7 @@ mv node_modules_resolved node_modules
 
 echo "download windows node..."
 cd bin
-wget "http://nodejs.org/dist/v$NODE_VERSION/node.exe" -O node.exe
+wget "http://nodejs.org/dist/v$NODE_VERSION/node.exe" -O ../node.exe
 
 echo "create the zip..."
 cd /tmp

From 0e258c4229079f9c824acb9617075464aee71d41 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 1 Aug 2012 23:42:52 +0200
Subject: [PATCH 5/5] Use latest node version in buildForWindows.sh

---
 bin/buildForWindows.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh
index 7486ccf56..1d47bff1b 100755
--- a/bin/buildForWindows.sh
+++ b/bin/buildForWindows.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-NODE_VERSION="0.6.5"
+NODE_VERSION="0.8.4"
 
 #Move to the folder where ep-lite is installed
 cd `dirname $0`