From 3142c2ce1cb65df2184de810cd7f6605e8c22522 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 24 Jul 2014 09:01:11 -0400
Subject: [PATCH] vagrant: say how to download glassfish and solr #725 #765

---
 scripts/vagrant/setup.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/vagrant/setup.sh b/scripts/vagrant/setup.sh
index 69716d622c8..59e445bb5c1 100644
--- a/scripts/vagrant/setup.sh
+++ b/scripts/vagrant/setup.sh
@@ -12,7 +12,11 @@ chkconfig postgresql on
 GLASSFISH_USER=glassfish
 echo "Ensuring Unix user '$GLASSFISH_USER' exists"
 useradd $GLASSFISH_USER || :
-GLASSFISH_ZIP=`ls /dataverse/downloads/glassfish*zip`
+GLASSFISH_ZIP='/dataverse/downloads/glassfish-4.0.zip'
+if [ ! -f $GLASSFISH_ZIP ]; then
+    echo "Couldn't find $GLASSFISH_ZIP! Please run the script in the \"downloads\" directory followed by \"vagrant destroy\". Then try \"vagrant up\" again." >&2
+    exit 1
+fi
 GLASSFISH_USER_HOME=~glassfish
 GLASSFISH_ROOT=$GLASSFISH_USER_HOME/glassfish4
 if [ ! -d $GLASSFISH_ROOT ]; then