From ea8fa964c127c2ad12d83b8e86c37fd9b2e5f9ee Mon Sep 17 00:00:00 2001 From: sonique6784 Date: Sat, 23 Sep 2017 19:29:25 +1000 Subject: [PATCH] scripts: update checkdeps for openjdk and libjson-perl on Arch --- scripts/checkdeps | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/checkdeps b/scripts/checkdeps index 06935e8f1f..590ca967da 100755 --- a/scripts/checkdeps +++ b/scripts/checkdeps @@ -34,6 +34,11 @@ test_libjson-perl() perl -MJSON -e 'exit(0);' 2>/dev/null } +test_perl-json() +{ + test_libjson-perl +} + if [ -f /etc/lsb-release ]; then DISTRO=$(grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr A-Z a-z) fi @@ -63,7 +68,7 @@ case "$DISTRO" in ;; arch) 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) deps="$deps g++ mkfontscale mkfontdir bdftopcf xsltproc java" @@ -78,7 +83,14 @@ esac if ! test_libjson-perl; then 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 # project specific dependencies