From 042346643c12f1ef89069ccae7f4ed8c89b44aa6 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Tue, 3 Nov 2020 02:14:53 +0100 Subject: [PATCH] refactor(dependencies): install gsfonts on all debian based distros ghostscript isn't needed on debian, but at least gsfonts is also needed on ubuntu. --- diaspora/osfamilymap.yaml | 2 +- diaspora/osfingermap.yaml | 3 ++- diaspora/osmap.yaml | 16 +--------------- .../_mapdata/files/_mapdata/debian-10.yaml | 2 +- .../_mapdata/files/_mapdata/debian-9.yaml | 2 +- .../_mapdata/files/_mapdata/ubuntu-18.yaml | 1 + .../_mapdata/files/_mapdata/ubuntu-20.yaml | 1 + 7 files changed, 8 insertions(+), 19 deletions(-) diff --git a/diaspora/osfamilymap.yaml b/diaspora/osfamilymap.yaml index f232d77..a072639 100644 --- a/diaspora/osfamilymap.yaml +++ b/diaspora/osfamilymap.yaml @@ -22,7 +22,7 @@ Debian: - libxslt1-dev - imagemagick - libmagickwand-dev - - ghostscript + - gsfonts - nodejs - tzdata - libjemalloc2 diff --git a/diaspora/osfingermap.yaml b/diaspora/osfingermap.yaml index 905d154..dbd1770 100644 --- a/diaspora/osfingermap.yaml +++ b/diaspora/osfingermap.yaml @@ -24,7 +24,7 @@ Debian-9: - libxslt1-dev - imagemagick - libmagickwand-dev - - ghostscript + - gsfonts - nodejs - tzdata - libjemalloc1 @@ -44,6 +44,7 @@ Ubuntu-18.04: - libxslt1-dev - imagemagick - libmagickwand-dev + - gsfonts - nodejs - tzdata - libjemalloc1 diff --git a/diaspora/osmap.yaml b/diaspora/osmap.yaml index e658ea6..3808546 100644 --- a/diaspora/osmap.yaml +++ b/diaspora/osmap.yaml @@ -11,21 +11,7 @@ # osmap: {} --- # os_family: Debian -Ubuntu: - dependencies: - - build-essential - - git - - curl - - libcurl4-openssl-dev - - libidn11-dev - - libssl-dev - - libxml2-dev - - libxslt1-dev - - imagemagick - - libmagickwand-dev - - nodejs - - tzdata - - libjemalloc2 +Ubuntu: {} # os_family: RedHat CentOS: {} diff --git a/test/integration/_mapdata/files/_mapdata/debian-10.yaml b/test/integration/_mapdata/files/_mapdata/debian-10.yaml index 71380dc..0725dc5 100644 --- a/test/integration/_mapdata/files/_mapdata/debian-10.yaml +++ b/test/integration/_mapdata/files/_mapdata/debian-10.yaml @@ -27,7 +27,7 @@ dependencies: - libxslt1-dev - imagemagick - libmagickwand-dev -- ghostscript +- gsfonts - nodejs - tzdata - libjemalloc2 diff --git a/test/integration/_mapdata/files/_mapdata/debian-9.yaml b/test/integration/_mapdata/files/_mapdata/debian-9.yaml index c65dec7..7de3407 100644 --- a/test/integration/_mapdata/files/_mapdata/debian-9.yaml +++ b/test/integration/_mapdata/files/_mapdata/debian-9.yaml @@ -27,7 +27,7 @@ dependencies: - libxslt1-dev - imagemagick - libmagickwand-dev -- ghostscript +- gsfonts - nodejs - tzdata - libjemalloc1 diff --git a/test/integration/_mapdata/files/_mapdata/ubuntu-18.yaml b/test/integration/_mapdata/files/_mapdata/ubuntu-18.yaml index 63780f9..8ed2186 100644 --- a/test/integration/_mapdata/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/_mapdata/files/_mapdata/ubuntu-18.yaml @@ -27,6 +27,7 @@ dependencies: - libxslt1-dev - imagemagick - libmagickwand-dev +- gsfonts - nodejs - tzdata - libjemalloc1 diff --git a/test/integration/_mapdata/files/_mapdata/ubuntu-20.yaml b/test/integration/_mapdata/files/_mapdata/ubuntu-20.yaml index fa1cc4c..188d898 100644 --- a/test/integration/_mapdata/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/_mapdata/files/_mapdata/ubuntu-20.yaml @@ -27,6 +27,7 @@ dependencies: - libxslt1-dev - imagemagick - libmagickwand-dev +- gsfonts - nodejs - tzdata - libjemalloc2