2019-10-02 12:04:02

by Jeremy MAURO

Subject: [PATCH 1/2] scripts/sphinx-pre-install: Change the function 'check_missing_file'

The current implementation take a simple file as first argument, this
change allows to take a list as a first argument.

Some file could have a different path according distribution version

Signed-off-by: Jeremy MAURO <[email protected]>
---
scripts/sphinx-pre-install | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index 3b638c0e1a4f..b5077ae63a4b 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -124,11 +124,13 @@ sub add_package($$)

sub check_missing_file($$$)
{
- my $file = shift;
+ my $files = shift;
my $package = shift;
my $is_optional = shift;

- return if(-e $file);
+ for (@$files) {
+ return if(-e $_);
+ }

add_package($package, $is_optional);
}
@@ -343,10 +345,10 @@ sub give_debian_hints()
);

if ($pdf) {
- check_missing_file("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
+ check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
"fonts-dejavu", 2);

- check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
+ check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
"fonts-noto-cjk", 2);
}

@@ -413,7 +415,7 @@ sub give_redhat_hints()
}

if ($pdf) {
- check_missing_file("/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
+ check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
"google-noto-sans-cjk-ttc-fonts", 2);
}

@@ -498,7 +500,7 @@ sub give_mageia_hints()
$map{"latexmk"} = "texlive-collection-basic";

if ($pdf) {
- check_missing_file("/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
+ check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
"google-noto-sans-cjk-ttc-fonts", 2);
}

@@ -528,7 +530,7 @@ sub give_arch_linux_hints()
check_pacman_missing(\@archlinux_tex_pkgs, 2) if ($pdf);

if ($pdf) {
- check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
+ check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
"noto-fonts-cjk", 2);
}

@@ -549,11 +551,11 @@ sub give_gentoo_hints()
"rsvg-convert" => "gnome-base/librsvg",
);

- check_missing_file("/usr/share/fonts/dejavu/DejaVuSans.ttf",
+ check_missing_file(["/usr/share/fonts/dejavu/DejaVuSans.ttf"],
"media-fonts/dejavu", 2) if ($pdf);

if ($pdf) {
- check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf",
+ check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf"],
"media-fonts/noto-cjk", 2);
}

--
2.23.0

2019-10-02 12:10:49

by Mauro Carvalho Chehab

Subject: Re: [PATCH 1/2] scripts/sphinx-pre-install: Change the function 'check_missing_file'

Em Wed, 2 Oct 2019 11:53:30 +0200
Jeremy MAURO <[email protected]> escreveu:

> The current implementation take a simple file as first argument, this
> change allows to take a list as a first argument.

Please change the title of this patch in a way that it will describe
what it will do, and not what function was changed.

Something like:

scripts/sphinx-pre-install: allow checking for multiple missing files

>
> Some file could have a different path according distribution version
>
> Signed-off-by: Jeremy MAURO <[email protected]>
> ---
> scripts/sphinx-pre-install | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
> index 3b638c0e1a4f..b5077ae63a4b 100755
> --- a/scripts/sphinx-pre-install
> +++ b/scripts/sphinx-pre-install
> @@ -124,11 +124,13 @@ sub add_package($$)
>
> sub check_missing_file($$$)

As it is now expecting a list, I would change this function name as
well to:
check_missing_files


With those changes, feel free to add:

Reviewed-by: Mauro Carvalho Chehab <[email protected]>


> {
> - my $file = shift;
> + my $files = shift;
> my $package = shift;
> my $is_optional = shift;
>
> - return if(-e $file);
> + for (@$files) {
> + return if(-e $_);
> + }
>
> add_package($package, $is_optional);
> }
> @@ -343,10 +345,10 @@ sub give_debian_hints()
> );
>
> if ($pdf) {
> - check_missing_file("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
> + check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
> "fonts-dejavu", 2);
>
> - check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
> + check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
> "fonts-noto-cjk", 2);
> }
>
> @@ -413,7 +415,7 @@ sub give_redhat_hints()
> }
>
> if ($pdf) {
> - check_missing_file("/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
> + check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
> "google-noto-sans-cjk-ttc-fonts", 2);
> }
>
> @@ -498,7 +500,7 @@ sub give_mageia_hints()
> $map{"latexmk"} = "texlive-collection-basic";
>
> if ($pdf) {
> - check_missing_file("/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
> + check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
> "google-noto-sans-cjk-ttc-fonts", 2);
> }
>
> @@ -528,7 +530,7 @@ sub give_arch_linux_hints()
> check_pacman_missing(\@archlinux_tex_pkgs, 2) if ($pdf);
>
> if ($pdf) {
> - check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
> + check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
> "noto-fonts-cjk", 2);
> }
>
> @@ -549,11 +551,11 @@ sub give_gentoo_hints()
> "rsvg-convert" => "gnome-base/librsvg",
> );
>
> - check_missing_file("/usr/share/fonts/dejavu/DejaVuSans.ttf",
> + check_missing_file(["/usr/share/fonts/dejavu/DejaVuSans.ttf"],
> "media-fonts/dejavu", 2) if ($pdf);
>
> if ($pdf) {
> - check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf",
> + check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf"],
> "media-fonts/noto-cjk", 2);
> }
>



Thanks,
Mauro

2019-10-02 13:44:35

by Jeremy MAURO

Subject: [PATCH v2 1/2] scripts/sphinx-pre-install: allow checking for multiple missing files

The current implementation take a simple file as first argument, this
change allows to take a list as a first argument.

Some file could have a different path according distribution version

Signed-off-by: Jeremy MAURO <[email protected]>
---
Changes in v2:
- Change the commit message

scripts/sphinx-pre-install | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index 3b638c0e1a4f..b5077ae63a4b 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -124,11 +124,13 @@ sub add_package($$)

sub check_missing_file($$$)
{
- my $file = shift;
+ my $files = shift;
my $package = shift;
my $is_optional = shift;

- return if(-e $file);
+ for (@$files) {
+ return if(-e $_);
+ }

add_package($package, $is_optional);
}
@@ -343,10 +345,10 @@ sub give_debian_hints()
);

if ($pdf) {
- check_missing_file("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
+ check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
"fonts-dejavu", 2);

- check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
+ check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
"fonts-noto-cjk", 2);
}

@@ -413,7 +415,7 @@ sub give_redhat_hints()
}

if ($pdf) {
- check_missing_file("/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
+ check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
"google-noto-sans-cjk-ttc-fonts", 2);
}

@@ -498,7 +500,7 @@ sub give_mageia_hints()
$map{"latexmk"} = "texlive-collection-basic";

if ($pdf) {
- check_missing_file("/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
+ check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
"google-noto-sans-cjk-ttc-fonts", 2);
}

@@ -528,7 +530,7 @@ sub give_arch_linux_hints()
check_pacman_missing(\@archlinux_tex_pkgs, 2) if ($pdf);

if ($pdf) {
- check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
+ check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
"noto-fonts-cjk", 2);
}

@@ -549,11 +551,11 @@ sub give_gentoo_hints()
"rsvg-convert" => "gnome-base/librsvg",
);

- check_missing_file("/usr/share/fonts/dejavu/DejaVuSans.ttf",
+ check_missing_file(["/usr/share/fonts/dejavu/DejaVuSans.ttf"],
"media-fonts/dejavu", 2) if ($pdf);

if ($pdf) {
- check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf",
+ check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf"],
"media-fonts/noto-cjk", 2);
}

--
2.23.0

2019-10-02 13:48:15

by Mauro Carvalho Chehab

Subject: Re: [PATCH v2 1/2] scripts/sphinx-pre-install: allow checking for multiple missing files

Em Wed, 2 Oct 2019 15:33:39 +0200
Jeremy MAURO <[email protected]> escreveu:

> The current implementation take a simple file as first argument, this
> change allows to take a list as a first argument.
>
> Some file could have a different path according distribution version
>
> Signed-off-by: Jeremy MAURO <[email protected]>

Reviewed-by: Mauro Carvalho Chehab <[email protected]>

> ---
> Changes in v2:
> - Change the commit message
>
> scripts/sphinx-pre-install | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
> index 3b638c0e1a4f..b5077ae63a4b 100755
> --- a/scripts/sphinx-pre-install
> +++ b/scripts/sphinx-pre-install
> @@ -124,11 +124,13 @@ sub add_package($$)
>
> sub check_missing_file($$$)
> {
> - my $file = shift;
> + my $files = shift;
> my $package = shift;
> my $is_optional = shift;
>
> - return if(-e $file);
> + for (@$files) {
> + return if(-e $_);
> + }
>
> add_package($package, $is_optional);
> }
> @@ -343,10 +345,10 @@ sub give_debian_hints()
> );
>
> if ($pdf) {
> - check_missing_file("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
> + check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
> "fonts-dejavu", 2);
>
> - check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
> + check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
> "fonts-noto-cjk", 2);
> }
>
> @@ -413,7 +415,7 @@ sub give_redhat_hints()
> }
>
> if ($pdf) {
> - check_missing_file("/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
> + check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
> "google-noto-sans-cjk-ttc-fonts", 2);
> }
>
> @@ -498,7 +500,7 @@ sub give_mageia_hints()
> $map{"latexmk"} = "texlive-collection-basic";
>
> if ($pdf) {
> - check_missing_file("/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc",
> + check_missing_file(["/usr/share/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc"],
> "google-noto-sans-cjk-ttc-fonts", 2);
> }
>
> @@ -528,7 +530,7 @@ sub give_arch_linux_hints()
> check_pacman_missing(\@archlinux_tex_pkgs, 2) if ($pdf);
>
> if ($pdf) {
> - check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc",
> + check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJK-Regular.ttc"],
> "noto-fonts-cjk", 2);
> }
>
> @@ -549,11 +551,11 @@ sub give_gentoo_hints()
> "rsvg-convert" => "gnome-base/librsvg",
> );
>
> - check_missing_file("/usr/share/fonts/dejavu/DejaVuSans.ttf",
> + check_missing_file(["/usr/share/fonts/dejavu/DejaVuSans.ttf"],
> "media-fonts/dejavu", 2) if ($pdf);
>
> if ($pdf) {
> - check_missing_file("/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf",
> + check_missing_file(["/usr/share/fonts/noto-cjk/NotoSansCJKsc-Regular.otf"],
> "media-fonts/noto-cjk", 2);
> }
>



Thanks,
Mauro