Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
nathandunn committed Mar 12, 2021
1 parent 94e3e1f commit e965720
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Features

- Added getAttributions method [2591](https://github.com/GMOD/Apollo/pull/2591) via @mbc32.

Bug Fix

- Provide better detection for Grails version and a better frix for [2020](https://github.com/GMOD/Apollo/issues/2020).

Infrastructure Changes

- Upgrade to [JBrowse 1.16.11](https://github.com/GMOD/jbrowse/releases/tag/1.16.11-release)
Expand Down
13 changes: 13 additions & 0 deletions apollo
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ function check_configs(){
grails_executable=$(which grails)
gradle_executable=$(which gradle)
git_executable=$(which git)

if ! [[ -x "$grails_executable" ]] ; then
if [[ -f 'grailsw' ]]; then
echo "Grails not found using grailsw";
Expand All @@ -155,6 +156,17 @@ function check_configs(){
echo "You must install 'grails' to install Apollo."
exit 1 ;
fi
else
echo $grails_executable
GRAILS_VERSION=`$grails_executable --version | grep Grails | cut -f2 -d: | xargs echo `;
echo "Grails version: ${GRAILS_VERSION}"
if [[ "$GRAILS_VERSION" != "2.5.5" ]];then
echo "Grails version ${GRAILS_VERSION} not supported. Only grails 2.5.5 supported so using local ./grailsw instead"
: "${JAVA_HOME?:Need to set JAVA_HOME}"
grails_executable="./grailsw"
else
echo "Using system grails `$grails_executable -v | cut -f4 -d' '`";
fi
fi

if ! [[ -x "$gradle_executable" ]] ; then
Expand All @@ -177,6 +189,7 @@ function check_configs(){

check_node
check_java
check_grails
}

function copy_configs(){
Expand Down

0 comments on commit e965720

Please sign in to comment.