diff --git a/scripts/functions/requirements/ubuntu b/scripts/functions/requirements/ubuntu index 3b1d9f3910..cf8ac773c4 100755 --- a/scripts/functions/requirements/ubuntu +++ b/scripts/functions/requirements/ubuntu @@ -17,6 +17,23 @@ requirements_debian_ensure_libs() __rvm_filter_installed_packages debian "$@" || return $? } +# find first installed lib +requirements_debian_lib_pick_first() +{ + typeset __lib + for __lib + do + if + requirements_debian_lib_installed "${__lib}" + then + echo "${__lib}" + return 0 + fi + done + # fallback to first if none installed + echo "$1" +} + requirements_debian_run() { case "$1" in @@ -28,14 +45,14 @@ requirements_debian_run() ;; (jruby*head) if (( ${_system_version//./} >= 1110 )) - then requirements_debian_ensure_libs ant openjdk-7-jdk + then requirements_debian_ensure_libs ant $( requirements_debian_lib_pick_first openjdk-7-jdk openjdk-6-jdk ) else requirements_debian_ensure_libs ant openjdk-6-jdk fi ;; (jruby*) if (( ${_system_version//./} >= 1110 )) - then requirements_debian_ensure_libs g++ openjdk-7-jre-headless - else requirements_debian_ensure_libs g++ openjdk-6-jre-headless + then requirements_debian_ensure_libs g++ $( requirements_debian_lib_pick_first openjdk-7-jre-headless openjdk-7-jdk openjdk-6-jre-headless openjdk-6-jdk ) + else requirements_debian_ensure_libs g++ $( requirements_debian_lib_pick_first openjdk-6-jre-headless openjdk-6-jdk ) fi ;; (ir*)