Merge pull request #826 from marcelklehr/remove-windows-settings-json

Remove windows settings json
ether · Jul 5, 2012 · 31ef973 · 31ef973
2 parents d59956b + d1dc023
commit 31ef973
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 50 deletions.
diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh
@@ -41,7 +41,7 @@ echo "do a normal unix install first..."
 bin/installDeps.sh || exit 1
 
 echo "copy the windows settings template..."
-cp settings.json.template_windows settings.json
+cp settings.json.template settings.json
 
 echo "resolve symbolic links..."
 cp -rL node_modules node_modules_resolved

diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat
@@ -32,7 +32,7 @@ del /S var\minified*
 
 echo _
 echo Setting up settings.json...
-IF NOT EXIST settings.json copy settings.json.template_windows settings.json
+IF NOT EXIST settings.json copy settings.json.template settings.json
 
 echo _
 echo Installed Etherpad-lite!
diff --git a/settings.json.template_windows b/settings.json.template_windows