From d220b6ad57960bbdd9b30effdf102f1bdd601587 Mon Sep 17 00:00:00 2001 From: "mr.Shu" Date: Wed, 9 Jan 2013 20:40:59 +0100 Subject: [PATCH 1/3] added /bin/bash to .sh files; should fix #15 --- start.sh | 1 + stop.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/start.sh b/start.sh index 40e285d766..59611c73c4 100755 --- a/start.sh +++ b/start.sh @@ -1,3 +1,4 @@ +#!/bin/bash cd `dirname "${BASH_SOURCE[0]}"`/kalite # move any previously downloaded content from the old location to the new diff --git a/stop.sh b/stop.sh index 41411bb3cc..81fe6dde2b 100755 --- a/stop.sh +++ b/stop.sh @@ -1,3 +1,4 @@ +#!/bin/bash cd `dirname "${BASH_SOURCE[0]}"`/kalite ./serverstop.sh ./cronstop.sh From 9609b25b0bfd679bfce1eab1c4316f3a4142bb2e Mon Sep 17 00:00:00 2001 From: "mr.Shu" Date: Wed, 9 Jan 2013 20:43:56 +0100 Subject: [PATCH 2/3] other bash fixes --- kalite/cronstop.sh | 2 ++ kalite/serverstop.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kalite/cronstop.sh b/kalite/cronstop.sh index 26037ac0ea..ed2e5d8824 100755 --- a/kalite/cronstop.sh +++ b/kalite/cronstop.sh @@ -1,3 +1,5 @@ +#!/bin/bash + pids=`ps aux | grep cronserver.py | grep -v "grep" | awk '{print $2}'` if [ "$pids" ]; then diff --git a/kalite/serverstop.sh b/kalite/serverstop.sh index 23f614f125..7a99dbae55 100755 --- a/kalite/serverstop.sh +++ b/kalite/serverstop.sh @@ -1,3 +1,5 @@ +#!/bin/bash + cd `dirname "${BASH_SOURCE[0]}"` if [ -f "runwsgiserver.pid" ]; then From a8899c17c1a50de24a552ce99f006ead9aaba647 Mon Sep 17 00:00:00 2001 From: "mr.Shu" Date: Wed, 9 Jan 2013 20:45:15 +0100 Subject: [PATCH 3/3] added whitespace to increase readability --- start.sh | 1 + stop.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/start.sh b/start.sh index 59611c73c4..495719e6fc 100755 --- a/start.sh +++ b/start.sh @@ -1,4 +1,5 @@ #!/bin/bash + cd `dirname "${BASH_SOURCE[0]}"`/kalite # move any previously downloaded content from the old location to the new diff --git a/stop.sh b/stop.sh index 81fe6dde2b..034326d33a 100755 --- a/stop.sh +++ b/stop.sh @@ -1,4 +1,5 @@ #!/bin/bash + cd `dirname "${BASH_SOURCE[0]}"`/kalite ./serverstop.sh ./cronstop.sh