From 15d89789f22069e78709b6627a2a02ac31d44968 Mon Sep 17 00:00:00 2001 From: Fergus Leen Date: Mon, 16 Jun 2014 21:48:27 +0100 Subject: [PATCH 1/3] Checks for false positive 64 bit --- scripts/devSetup/systemConfiguration.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/devSetup/systemConfiguration.py b/scripts/devSetup/systemConfiguration.py index c8b2b99de..78df92fdf 100644 --- a/scripts/devSetup/systemConfiguration.py +++ b/scripts/devSetup/systemConfiguration.py @@ -33,6 +33,8 @@ class SystemConfiguration(object): return 64 else: if self.operating_system == u"mac": + if os.uname()[4] == u"x86_64": + return 64 raise NotSupportedError(u"Your processor is determined to have a maxSize of" + str(sys.maxsize) + u",\n which doesn't correspond with a 64-bit architecture.") return 32 From 42304d8fb44984fd0fd05f91b3120798e846e74f Mon Sep 17 00:00:00 2001 From: Fergus Leen Date: Tue, 17 Jun 2014 19:30:32 +0100 Subject: [PATCH 2/3] Check for git repository before cloning --- scripts/devSetup/bootstrap.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/devSetup/bootstrap.sh b/scripts/devSetup/bootstrap.sh index 9d1f34b8e..46099635c 100644 --- a/scripts/devSetup/bootstrap.sh +++ b/scripts/devSetup/bootstrap.sh @@ -58,7 +58,13 @@ checkDependencies deps[@] basicDependenciesErrorHandling if command -v node >/dev/null 2>&1; then checkNodeVersion fi -#install git repository -git clone $repositoryUrl coco -#python ./coco/scripts/devSetup/setup.py -echo "Now copy and paste 'sudo python ./coco/scripts/devSetup/setup.py' into the terminal!" + +#check if a git repository already exists here +if [ -d .git ]; then + echo "A git repository already exists here!" +else + #install git repository + git clone $repositoryUrl coco + #python ./coco/scripts/devSetup/setup.py + echo "Now copy and paste 'sudo python ./coco/scripts/devSetup/setup.py' into the terminal!" +fi From ecf24c28754baf17c73d494f42ec72b2c4fcabbf Mon Sep 17 00:00:00 2001 From: Fergus Leen Date: Tue, 17 Jun 2014 19:56:13 +0100 Subject: [PATCH 3/3] Commit on wrong branch - reverted --- scripts/devSetup/bootstrap.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/scripts/devSetup/bootstrap.sh b/scripts/devSetup/bootstrap.sh index 46099635c..9d1f34b8e 100644 --- a/scripts/devSetup/bootstrap.sh +++ b/scripts/devSetup/bootstrap.sh @@ -58,13 +58,7 @@ checkDependencies deps[@] basicDependenciesErrorHandling if command -v node >/dev/null 2>&1; then checkNodeVersion fi - -#check if a git repository already exists here -if [ -d .git ]; then - echo "A git repository already exists here!" -else - #install git repository - git clone $repositoryUrl coco - #python ./coco/scripts/devSetup/setup.py - echo "Now copy and paste 'sudo python ./coco/scripts/devSetup/setup.py' into the terminal!" -fi +#install git repository +git clone $repositoryUrl coco +#python ./coco/scripts/devSetup/setup.py +echo "Now copy and paste 'sudo python ./coco/scripts/devSetup/setup.py' into the terminal!"