]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
scripts/sphinx-pre-install: cleanup Gentoo checks
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Sat, 13 Jul 2019 11:19:44 +0000 (08:19 -0300)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 17 Jul 2019 09:57:52 +0000 (06:57 -0300)
On Gentoo, the portage changes for ImageMagick to work are
always suggested, even if already applied. While the two
extra commands should be harmless, add a check to avoid
reporting it without need.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
scripts/sphinx-pre-install

index 8dc13fe95ffe87a9687e264d9fbfa26c86a903a2..0a5c83aa5f4457e01650a1a0baa16b5d9e816e70 100755 (executable)
@@ -533,8 +533,19 @@ sub give_gentoo_hints()
        return if (!$need && !$optional);
 
        printf("You should run:\n\n");
-       printf("\tsudo su -c 'echo \"media-gfx/imagemagick svg png\" > /etc/portage/package.use/imagemagick'\n");
-       printf("\tsudo su -c 'echo \"media-gfx/graphviz cairo pdf\" > /etc/portage/package.use/graphviz'\n");
+
+       my $imagemagick = "media-gfx/imagemagick svg png";
+       my $cairo = "media-gfx/graphviz cairo pdf";
+       my $portage_imagemagick = "/etc/portage/package.use/imagemagick";
+       my $portage_cairo = "/etc/portage/package.use/graphviz";
+
+       if (qx(cat $portage_imagemagick) ne "$imagemagick\n") {
+               printf("\tsudo su -c 'echo \"$imagemagick\" > $portage_imagemagick'\n")
+       }
+       if (qx(cat $portage_cairo) ne  "$cairo\n") {
+               printf("\tsudo su -c 'echo \"$cairo\" > $portage_cairo'\n");
+       }
+
        printf("\tsudo emerge --ask $install\n");
 
 }