You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/05/08 00:28:24 UTC

[46/50] [abbrv] git commit: [#3854] Fix mongo version check and venv path

[#3854] Fix mongo version check and venv path

Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/dd2acbb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/dd2acbb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/dd2acbb2

Branch: refs/heads/tv/3854
Commit: dd2acbb21420a68b2ed9a6e62ab5b23892b5d1a7
Parents: ea1af85
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Tue Apr 30 00:29:11 2013 -0400
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Tue May 7 18:26:54 2013 -0400

----------------------------------------------------------------------
 vagrant/allura_setup.sh |    2 +-
 vagrant/start_allura    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dd2acbb2/vagrant/allura_setup.sh
----------------------------------------------------------------------
diff --git a/vagrant/allura_setup.sh b/vagrant/allura_setup.sh
index e382fac..4da7f8d 100755
--- a/vagrant/allura_setup.sh
+++ b/vagrant/allura_setup.sh
@@ -21,7 +21,7 @@
 MONGODB_VERSION=2.2.3
 MONGODB_PKG_URL="deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen"
 MONGODB_SRC_LST=/etc/apt/sources.list.d/10gen.list
-if [ $(mongo --version 2>/dev/null | sed 's/.*: //') != $MONGODB_VERSION ]
+if [ "$(mongo --version 2>/dev/null | sed 's/.*: //')" != "$MONGODB_VERSION" ]
 then
   echo "Installing Mongodb $MONGODB_VERSION..."
   sudo apt-get -y -q purge mongodb mongodb-clients mongodb-server mongodb-dev

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dd2acbb2/vagrant/start_allura
----------------------------------------------------------------------
diff --git a/vagrant/start_allura b/vagrant/start_allura
index 758a4bd..c396f7a 100755
--- a/vagrant/start_allura
+++ b/vagrant/start_allura
@@ -20,7 +20,7 @@
 # Starts Allura platform services
 
 # Activate Allura virtualenv
-. /home/vagrant/anvil/bin/activate
+. /home/vagrant/env-allura/bin/activate
 
 # Create log dir
 if [ ! -d /var/log/allura ]