From be40fc337ea3620bcf05ce0dbcd5c95f26424276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Moratinos?=
<codecombat@sebastien-moratinos.com>
Date: Sun, 5 Jan 2014 18:32:42 +0100
Subject: [PATCH 1/2] fix directory path in shell script
---
bin/coco-client-test-runner | 9 ++++++++-
bin/coco-server-test-runner | 10 ++++++++--
bin/coco-test-server | 9 ++++++++-
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/bin/coco-client-test-runner b/bin/coco-client-test-runner
index fa88b51b6..2ec45aa29 100755
--- a/bin/coco-client-test-runner
+++ b/bin/coco-client-test-runner
@@ -1,7 +1,14 @@
#!/bin/bash
+# full script path include his name
+_script="$(readlink -f ${BASH_SOURCE[0]})"
+
+# Script location path (dir)
+_base="$(dirname $_script)"
+
sleep 5
-cd ~/Desktop/coco
+cd $_base
+cd ../
until node_modules/karma/bin/karma start; do
echo "Karma crashed with exit code $?. Respawning.." >&2
sleep 1
diff --git a/bin/coco-server-test-runner b/bin/coco-server-test-runner
index 703db7f94..14310bd78 100755
--- a/bin/coco-server-test-runner
+++ b/bin/coco-server-test-runner
@@ -1,5 +1,11 @@
#!/bin/bash
-#sleep 5
-cd ~/Desktop/coco
+# full script path include his name
+_script="$(readlink -f ${BASH_SOURCE[0]})"
+
+# Script location path (dir)
+_base="$(dirname $_script)"
+
+cd $_base
+cd ../
node_modules/jasmine-node/bin/jasmine-node test/server/ --coffee --autotest --captureExceptions
diff --git a/bin/coco-test-server b/bin/coco-test-server
index 371a76312..f9856b86b 100755
--- a/bin/coco-test-server
+++ b/bin/coco-test-server
@@ -1,4 +1,11 @@
#!/bin/bash
-cd ~/Desktop/coco
+# full script path include his name
+_script="$(readlink -f ${BASH_SOURCE[0]})"
+
+# Script location path (dir)
+_base="$(dirname $_script)"
+
+cd $_base
+cd ../
node_modules/.bin/nodemon . --ext ".coffee|.js" --watch server --watch server.coffee --unittest
From a2138e5d3d7855f5a16951783f6a539363ac5c0b Mon Sep 17 00:00:00 2001
From: Michael Schmatz <schmatz@umich.edu>
Date: Sun, 5 Jan 2014 14:01:19 -0500
Subject: [PATCH 2/2] Fixed bin deletion bug
---
scripts/devSetup/directoryController.py | 5 ++++-
scripts/devSetup/factories.py | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/scripts/devSetup/directoryController.py b/scripts/devSetup/directoryController.py
index 03bec6705..630fb5c05 100644
--- a/scripts/devSetup/directoryController.py
+++ b/scripts/devSetup/directoryController.py
@@ -39,7 +39,10 @@ class DirectoryController(object):
raise errors.CoCoError(u"There was an error creating the directory structure, do you have correct permissions? Please remove all and start over.")
def remove_directories(self):
- shutil.rmtree(self.tmp_directory)
shutil.rmtree(self.bin_directory + os.sep + "node",ignore_errors=True)
shutil.rmtree(self.bin_directory + os.sep + "mongo",ignore_errors=True)
+ def remove_tmp_directory(self):
+ shutil.rmtree(self.tmp_directory)
+
+
diff --git a/scripts/devSetup/factories.py b/scripts/devSetup/factories.py
index 1edbec108..5745611cf 100644
--- a/scripts/devSetup/factories.py
+++ b/scripts/devSetup/factories.py
@@ -63,7 +63,7 @@ class SetupFactory(object):
print("3. ./coco-dev-server")
print("Once brunch is done, visit http://localhost:3000!")
def cleanup(self):
- self.config.directory.remove_directories()
+ self.config.directory.remove_tmp_directory()
class MacSetup(SetupFactory):
def setup(self):