From 193afacb6f2c3affbabea4ca2cd5172550ea0c84 Mon Sep 17 00:00:00 2001 From: bm jade Date: Mon, 7 Aug 2017 16:36:44 +0200 Subject: [PATCH 1/2] FIX fix provide by skupfer from github, It fix the installOnWindows problem --- bin/installOnWindows.bat | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat index 89fa335d..d95bf4c4 100644 --- a/bin/installOnWindows.bat +++ b/bin/installOnWindows.bat @@ -1,21 +1,29 @@ @echo off :: change directory to etherpad-lite root -cd /D "%~dp0\.." +cd /D "%~dp0.." :: Is node installed? cmd /C node -e "" || ( echo "Please install node.js ( http://nodejs.org )" && exit /B 1 ) echo _ -echo Ensure that all dependencies are up to date... If this is the first time you have run Etherpad please be patient. -cmd /C npm install src/ --loglevel warn || exit /B 1 +echo Ensure that all dependencies are up to date... If this is the first time you have run Etherpad please be patient. + +mkdir node_modules +cd /D node_modules +mklink /D "ep_etherpad-lite" "..\src" + +cd /D "ep_etherpad-lite" +cmd /C npm install --loglevel warn || exit /B 1 + +cd /D "%~dp0.." echo _ echo Copying custom templates... set custom_dir=node_modules\ep_etherpad-lite\static\custom FOR %%f IN (index pad timeslider) DO ( - if NOT EXIST "%custom_dir%\%%f.js" copy "%custom_dir%\js.template" "%custom_dir%\%%f.js" - if NOT EXIST "%custom_dir%\%%f.css" copy "%custom_dir%\css.template" "%custom_dir%\%%f.css" + if NOT EXIST "%custom_dir%%%f.js" copy "%custom_dir%\js.template" "%custom_dir%%%f.js" + if NOT EXIST "%custom_dir%%%f.css" copy "%custom_dir%\css.template" "%custom_dir%%%f.css" ) echo _ @@ -25,10 +33,10 @@ del /S var\minified* echo _ echo Setting up 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 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! To run Etherpad type start.bat +echo Installed Etherpad! To run Etherpad type start.bat \ No newline at end of file From 64aee56940c08c2774c44c92e589037d8803c629 Mon Sep 17 00:00:00 2001 From: bm jade Date: Mon, 7 Aug 2017 17:15:02 +0200 Subject: [PATCH 2/2] FIX missing backslashes --- bin/installOnWindows.bat | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat index d95bf4c4..6abf66ab 100644 --- a/bin/installOnWindows.bat +++ b/bin/installOnWindows.bat @@ -1,13 +1,13 @@ @echo off :: change directory to etherpad-lite root -cd /D "%~dp0.." +cd /D "%~dp0\.." :: Is node installed? cmd /C node -e "" || ( echo "Please install node.js ( http://nodejs.org )" && exit /B 1 ) echo _ -echo Ensure that all dependencies are up to date... If this is the first time you have run Etherpad please be patient. +echo Ensure that all dependencies are up to date... If this is the first time you have run Etherpad please be patient. mkdir node_modules cd /D node_modules @@ -16,14 +16,14 @@ mklink /D "ep_etherpad-lite" "..\src" cd /D "ep_etherpad-lite" cmd /C npm install --loglevel warn || exit /B 1 -cd /D "%~dp0.." +cd /D "%~dp0\.." echo _ echo Copying custom templates... set custom_dir=node_modules\ep_etherpad-lite\static\custom FOR %%f IN (index pad timeslider) DO ( - if NOT EXIST "%custom_dir%%%f.js" copy "%custom_dir%\js.template" "%custom_dir%%%f.js" - if NOT EXIST "%custom_dir%%%f.css" copy "%custom_dir%\css.template" "%custom_dir%%%f.css" + if NOT EXIST "%custom_dir%\%%f.js" copy "%custom_dir%\js.template" "%custom_dir%\%%f.js" + if NOT EXIST "%custom_dir%\%%f.css" copy "%custom_dir%\css.template" "%custom_dir%\%%f.css" ) echo _ @@ -33,10 +33,10 @@ del /S var\minified* echo _ echo Setting up 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 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! To run Etherpad type start.bat \ No newline at end of file +echo Installed Etherpad! To run Etherpad type start.bat \ No newline at end of file