scripts/checkdeps: replace python2 with python3

This commit is contained in:
MilhouseVH 2019-10-24 22:51:28 +01:00
parent e5919f18a9
commit a7cf257127

View File

@ -68,8 +68,8 @@ perl_mod=(JSON XML::Parser Thread::Queue)
case "${DISTRO}" in case "${DISTRO}" in
fedora|centos|rhel) fedora|centos|rhel)
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python rpcgen) deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python3 rpcgen)
deps_pkg+=(gcc-c++ xorg-x11-font-utils xorg-x11-font-utils xorg-x11-font-utils libxslt java-1.7.0-openjdk python2 rpcgen) deps_pkg+=(gcc-c++ xorg-x11-font-utils xorg-x11-font-utils xorg-x11-font-utils libxslt java-1.7.0-openjdk python3 rpcgen)
if [[ ! $(rpm -qa glibc-static) ]]; then if [[ ! $(rpm -qa glibc-static) ]]; then
deps+=(glibc-static) deps+=(glibc-static)
deps_pkg+=(glibc-static) deps_pkg+=(glibc-static)
@ -82,19 +82,19 @@ case "${DISTRO}" in
perl_pkg=(perl-JSON perl-XML-Parser perl-Thread-Queue) perl_pkg=(perl-JSON perl-XML-Parser perl-Thread-Queue)
;; ;;
gentoo|sabayon) gentoo|sabayon)
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python rpcgen) deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python3 rpcgen)
deps_pkg+=("gcc[cxx]" mkfontscale mkfontdir bdftopcf libxslt virtual/jre python net-libs/rpcsvc-proto) deps_pkg+=("gcc[cxx]" mkfontscale mkfontdir bdftopcf libxslt virtual/jre python3 net-libs/rpcsvc-proto)
files_pkg=(glibc ncurses) files_pkg=(glibc ncurses)
perl_pkg=(JSON XML-Parser perl-Thread-Queue) perl_pkg=(JSON XML-Parser perl-Thread-Queue)
;; ;;
arch) arch)
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python rpcgen) deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python3 rpcgen)
deps_pkg+=(g++ xorg-mkfontscale xorg-mkfontdir xorg-bdftopcf libxslt "java-runtime-common jdk8-openjdk" python2 rpcsvc-proto) deps_pkg+=(g++ xorg-mkfontscale xorg-mkfontdir xorg-bdftopcf libxslt "java-runtime-common jdk8-openjdk" python3 rpcsvc-proto)
perl_pkg=(perl-json perl-xml-parser perl) perl_pkg=(perl-json perl-xml-parser perl)
;; ;;
opensuse) opensuse)
deps+=( g++ mkfontscale mkfontdir bdftopcf xsltproc java python) deps+=( g++ mkfontscale mkfontdir bdftopcf xsltproc java python3)
deps_pkg+=(gcc-c++ mkfontscale mkfontdir bdftopcf libxslt-tools java-1_8_0-openjdk python) deps_pkg+=(gcc-c++ mkfontscale mkfontdir bdftopcf libxslt-tools java-1_8_0-openjdk python3)
if [[ ! $(rpm -qa glibc-devel-static) ]]; then if [[ ! $(rpm -qa glibc-devel-static) ]]; then
deps+=(glibc-devel-static) deps+=(glibc-devel-static)
deps_pkg+=(glibc-devel-static) deps_pkg+=(glibc-devel-static)
@ -102,8 +102,8 @@ case "${DISTRO}" in
perl_pkg=(perl-JSON perl-XML-Parser perl) perl_pkg=(perl-JSON perl-XML-Parser perl)
;; ;;
*) *)
deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python) deps+=(g++ mkfontscale mkfontdir bdftopcf xsltproc java python3)
deps_pkg+=(g++ xfonts-utils xfonts-utils xfonts-utils xsltproc default-jre python) deps_pkg+=(g++ xfonts-utils xfonts-utils xfonts-utils xsltproc default-jre python3)
perl_pkg=(libjson-perl libxml-parser-perl perl) perl_pkg=(libjson-perl libxml-parser-perl perl)
;; ;;
esac esac