mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-12 02:01:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 42bbbd426f into 071ddefc39

Browse source
This commit is contained in:
GitHub Merge Button 2012-07-05 09:53:31 -07:00
commit 8897febcde
4 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bin/installDeps.sh
View file

@ -35,8 +35,8 @@ fi
#check node version
NODE_VERSION=$(node --version)
if [ ! $(echo $NODE_VERSION | cut -d "." -f 1-2) = "v0.6" ]; then
echo "You're running a wrong version of node, you're using $NODE_VERSION, we need v0.6.x" >&2
if [ ! $(echo $NODE_VERSION | cut -d "." -f 1-2) = "v0.8" ]; then
echo "You're running a wrong version of node, you're using $NODE_VERSION, we need v0.8.x" >&2
exit 1
fi

6
bin/installOnWindows.bat
View file

@ -1,5 +1,5 @@
@echo off
set NODE_VERSION=0.6.5
set NODE_VERSION=0.8.1
set JQUERY_VERSION=1.7
:: change directory to etherpad-lite root
@ -22,8 +22,8 @@ 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 _