Skip to content

Commit

Permalink
update build script to not rely on grails repo
Browse files Browse the repository at this point in the history
use local jetty plugin file when installing jetty grails plugin.
removed unnecessary downloading of jetty zip distribution
  • Loading branch information
gschueler committed Oct 12, 2011
1 parent 26367da commit ad15a7a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions build.sh
Expand Up @@ -60,19 +60,6 @@ export LOCALREPOURL=file:$LOCALREPO
export LOCALDEPSREPO=$BASEDIR/dependencies
export LOCALDEPSREPOURL=file:$LOCALDEPSREPO


mkdir -p $LOCALREPO/jetty/zips
if [ ! -f $LOCALREPO/jetty/zips/jetty-${JETTYVERS}.zip ] ; then
if [ ! -z "$PKGREPO" -a -f $PKGREPO/jetty/zips/jetty-${JETTYVERS}.zip ] ; then
cp $PKGREPO/jetty/zips/jetty-${JETTYVERS}.zip $LOCALREPO/jetty/zips/
else
# get ant zip dependency to local repo if it doesn't exist
echo "Downloading jetty-${JETTYVERS}.zip ... "
cd $LOCALREPO/jetty/zips
$GET http://dist.codehaus.org/jetty/jetty-${JETTYVERS}/jetty-${JETTYVERS}.zip
fi
fi

# extract grails to local dir for use during build of Run Deck
if [ ! -f $BUILD_ROOT/local/grails-$GRAILSVERS/bin/grails ] ; then
if [ ! -z "$PKGREPO" -a -f $PKGREPO/grails/zips/grails-$GRAILSVERS.zip ] ; then
Expand Down Expand Up @@ -165,7 +152,7 @@ export PATH=$PATH:$GRAILS_HOME/bin
GWORKDIR=$BASEDIR/rundeckapp/work

#echo 'y' to the command to quell y/n prompt on second time running it:
yes | $GRAILS_HOME/bin/grails $PROXY_DEFS -Dgrails.project.work.dir=$GWORKDIR install-plugin jetty
yes | $GRAILS_HOME/bin/grails $PROXY_DEFS -Dgrails.project.work.dir=$GWORKDIR install-plugin $BASEDIR/dependencies/grails-jetty/zips/grails-jetty-1.2-SNAPSHOT.zip
if [ 0 != $? ]
then
echo "failed to install jetty plugin"
Expand Down
Binary file not shown.

0 comments on commit ad15a7a

Please sign in to comment.