scripts: update checkdeps for openjdk and libjson-perl on Arch

This commit is contained in:
sonique6784 2017-09-23 19:29:25 +10:00 committed by Christian Hewitt
parent 2c482f45e2
commit ea8fa964c1

View File

@ -34,6 +34,11 @@ test_libjson-perl()
perl -MJSON -e 'exit(0);' 2>/dev/null perl -MJSON -e 'exit(0);' 2>/dev/null
} }
test_perl-json()
{
test_libjson-perl
}
if [ -f /etc/lsb-release ]; then if [ -f /etc/lsb-release ]; then
DISTRO=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr A-Z a-z) DISTRO=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr A-Z a-z)
fi fi
@ -63,7 +68,7 @@ case "$DISTRO" in
;; ;;
arch) arch)
deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java" deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java"
deps_pkg="$deps_pkg g++ xorg-mkfontscale xorg-mkfontdir xorg-bdftopcf libxslt java-runtime-common" deps_pkg="$deps_pkg g++ xorg-mkfontscale xorg-mkfontdir xorg-bdftopcf libxslt java-runtime-common jdk8-openjdk"
;; ;;
opensuse) opensuse)
deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java" deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java"
@ -78,7 +83,14 @@ esac
if ! test_libjson-perl; then if ! test_libjson-perl; then
files="$files perl/JSON.pm" files="$files perl/JSON.pm"
files_pkg="$files_pkg libjson-perl" case "$DISTRO" in
arch)
files_pkg="$files_pkg perl-json"
;;
*)
files_pkg="$files_pkg libjson-perl"
;;
esac
fi fi
# project specific dependencies # project specific dependencies