From c984f496c2f39d7ea296c378e6274bfbc6768a4f Mon Sep 17 00:00:00 2001 From: Garrett LeSage Date: Wed, 3 Aug 2011 23:08:27 +0200 Subject: [PATCH 1/2] fixed issue # 64, making the shell scripts more portable (for OS X) --- bin/debugRun.sh | 3 +-- bin/generateJsDoc.sh | 3 +-- bin/installDeps.sh | 3 +-- bin/run.sh | 3 +-- bin/safeRun.sh | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/bin/debugRun.sh b/bin/debugRun.sh index fede0b50..64b797be 100755 --- a/bin/debugRun.sh +++ b/bin/debugRun.sh @@ -1,8 +1,7 @@ #!/bin/sh #Move to the folder where ep-lite is installed -FOLDER=$(dirname $(readlink -f $0)) -cd $FOLDER +cd `dirname $0` #Was this script started in the bin folder? if yes move out if [ -d "../bin" ]; then diff --git a/bin/generateJsDoc.sh b/bin/generateJsDoc.sh index 1667c1cc..8704d5ad 100755 --- a/bin/generateJsDoc.sh +++ b/bin/generateJsDoc.sh @@ -1,8 +1,7 @@ #!/bin/sh #Move to the folder where ep-lite is installed -FOLDER=$(dirname $(readlink -f $0)) -cd $FOLDER +cd `dirname $0` #Was this script started in the bin folder? if yes move out if [ -d "../bin" ]; then diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 2c880896..c9f56392 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -1,8 +1,7 @@ #!/bin/sh #Move to the folder where ep-lite is installed -FOLDER=$(dirname $(readlink -f $0)) -cd $FOLDER +cd `dirname $0` #Was this script started in the bin folder? if yes move out if [ -d "../bin" ]; then diff --git a/bin/run.sh b/bin/run.sh index b5f85161..994f5d81 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -1,8 +1,7 @@ #!/bin/sh #Move to the folder where ep-lite is installed -FOLDER=$(dirname $(readlink -f $0)) -cd $FOLDER +cd `dirname $0` #Was this script started in the bin folder? if yes move out if [ -d "../bin" ]; then diff --git a/bin/safeRun.sh b/bin/safeRun.sh index d7d2b99c..b060f5d1 100755 --- a/bin/safeRun.sh +++ b/bin/safeRun.sh @@ -18,8 +18,7 @@ TIME_BETWEEN_EMAILS=600 # 10 minutes LAST_EMAIL_SEND=0 #Move to the folder where ep-lite is installed -FOLDER=$(dirname $(readlink -f $0)) -cd $FOLDER +cd `dirname $0` #Was this script started in the bin folder? if yes move out if [ -d "../bin" ]; then From d0addfddb3765d2f2d3a15ff61999384fcf79f8e Mon Sep 17 00:00:00 2001 From: Garrett LeSage Date: Wed, 3 Aug 2011 23:18:12 +0200 Subject: [PATCH 2/2] spelling fixes in the shell scripts --- bin/debugRun.sh | 2 +- bin/run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/debugRun.sh b/bin/debugRun.sh index 64b797be..01197a6b 100755 --- a/bin/debugRun.sh +++ b/bin/debugRun.sh @@ -20,7 +20,7 @@ hash node-inspector > /dev/null 2>&1 || { node-inspector & -echo "If you new to node-inspector, take a look at this video: http://youtu.be/AOnK3NVnxL8" +echo "If you are new to node-inspector, take a look at this video: http://youtu.be/AOnK3NVnxL8" cd "node" node --debug server.js diff --git a/bin/run.sh b/bin/run.sh index 994f5d81..a5245ff7 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -15,7 +15,7 @@ if [ "$(id -u)" -eq 0 ]; then read rocks if [ ! $rocks = "Etherpad Lite rocks my socks" ] then - echo "You're input was wrong" + echo "Your input was incorrect" exit 1 fi fi