18700: iceweasel->firefox for debian>10, drop from non-test env.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index d4b79ace23982a12b291f3456c015da5d08c4871..d31de66b188d732681d2549b948456f612dee313 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -143,7 +143,6 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
                        "default-jdk-headless",
                        "default-jre-headless",
                        "gettext",
-                       "iceweasel",
                        "libattr1-dev",
                        "libcrypt-ssleay-perl",
                        "libfuse-dev",
@@ -181,10 +180,15 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
                        "wget",
                        "xvfb",
                )
+               if test {
+                       if osv.Debian && osv.Major <= 10 {
+                               pkgs = append(pkgs, "iceweasel")
+                       } else {
+                               pkgs = append(pkgs, "firefox")
+                       }
+               }
                if dev || test {
-                       pkgs = append(pkgs,
-                               "squashfs-tools", // for singularity
-                       )
+                       pkgs = append(pkgs, "squashfs-tools") // for singularity
                }
                switch {
                case osv.Debian && osv.Major >= 10: