diff --git a/recipes/gatk-framework/gatk-framework b/recipes/gatk-framework/gatk-framework index 485313eeef6d5..8eb4749cd7c4c 100644 --- a/recipes/gatk-framework/gatk-framework +++ b/recipes/gatk-framework/gatk-framework @@ -21,7 +21,7 @@ ENV_PREFIX="$(dirname $(dirname $DIR))" # Use Java installed with Anaconda to ensure correct version java="$ENV_PREFIX/bin/java" -if [ -z "${JAVA_HOME:=}" ]; then +if [ -n "${JAVA_HOME:=}" ]; then if [ -e "$JAVA_HOME/bin/java" ]; then java="$JAVA_HOME/bin/java" fi diff --git a/recipes/gatk-framework/meta.yaml b/recipes/gatk-framework/meta.yaml index b099152ac3d2d..19d07d38c45f1 100644 --- a/recipes/gatk-framework/meta.yaml +++ b/recipes/gatk-framework/meta.yaml @@ -8,7 +8,7 @@ package: version: '3.6.24' build: - number: 3 + number: 4 skip: False source: diff --git a/recipes/picard/meta.yaml b/recipes/picard/meta.yaml index 5080fa121ab46..9a92730f23128 100644 --- a/recipes/picard/meta.yaml +++ b/recipes/picard/meta.yaml @@ -8,17 +8,17 @@ source: md5: 0449279a6a89830917e8bcef3a976ef7 build: - number: 0 + number: 1 skip: False requirements: run: - - java-jdk >=8 + - openjdk >=8 - python test: commands: - - "picard 2>&1 | grep 'USAGE: PicardCommandLine'" + - "picard 2>&1 | grep USAGE:" about: home: "http://broadinstitute.github.io/picard/" diff --git a/recipes/picard/picard.sh b/recipes/picard/picard.sh index 93662fc0222ea..a17d9fb194bf9 100755 --- a/recipes/picard/picard.sh +++ b/recipes/picard/picard.sh @@ -21,7 +21,7 @@ ENV_PREFIX="$(dirname $(dirname $DIR))" java="$ENV_PREFIX/bin/java" # if JAVA_HOME is set (non-empty), use it. Otherwise keep "java" -if [ ! -z "${JAVA_HOME:=}" ]; then +if [ -n "${JAVA_HOME:=}" ]; then if [ -e "$JAVA_HOME/bin/java" ]; then java="$JAVA_HOME/bin/java" fi diff --git a/recipes/snpeff/meta.yaml b/recipes/snpeff/meta.yaml index 2852c6f4b59f6..33683b64f9c80 100644 --- a/recipes/snpeff/meta.yaml +++ b/recipes/snpeff/meta.yaml @@ -13,7 +13,7 @@ package: version: {{ version }} build: - number: 0 + number: 1 skip: False source: diff --git a/recipes/snpeff/snpeff.sh b/recipes/snpeff/snpeff.sh index 3de56188695a6..14e45e54fbb5e 100644 --- a/recipes/snpeff/snpeff.sh +++ b/recipes/snpeff/snpeff.sh @@ -21,7 +21,7 @@ JAR_DIR=$DIR java=java -if [ -z "${JAVA_HOME:=}" ]; then +if [ -n "${JAVA_HOME:=}" ]; then if [ -e "$JAVA_HOME/bin/java" ]; then java="$JAVA_HOME/bin/java" fi