From 1f0353d68046f2758da75682f468cfafe446a4b6 Mon Sep 17 00:00:00 2001 From: Peter 'Pita' Martischka Date: Thu, 23 Jun 2011 11:34:57 +0100 Subject: [PATCH] Change 'npm link' to 'npm install'. It does the same but doesn't need root permissions and it's able to check which dependencies are already installed --- README.md | 4 ++-- bin/run.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3f5680606..a3faefa41 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,14 @@ Visit to test it live 2. Install npm `curl http://npmjs.org/install.sh | sh` 3. Ensure you have installed the sqlite develob libraries, gzip and git `apt-get install libsqlite3-dev gzip git-core` 4. Clone the git repository `git clone 'git://github.com/Pita/etherpad-lite.git'` -5. Install the dependencies `cd etherpad-lite && npm link` +5. Install the dependencies `cd etherpad-lite && npm install` 6. Start it with `bin/run.sh` 7. Open your web browser and visit # Next Steps You can modify the settings in the file settings.json -You can update to the latest version with `git pull origin && npm link` +You can update to the latest version with `git pull origin && npm install` You can debug with `bin/runDebug.sh` diff --git a/bin/run.sh b/bin/run.sh index af2d04914..3940e87c4 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -34,6 +34,9 @@ if [ ! -f "settings.json" ]; then cp -v settings.json.template settings.json fi +echo "Ensure that all dependencies are up to date..." +npm install + #Remove all minified data to force node creating it new echo "Clear minfified cache..." rm var/minified* 2> /dev/null