[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] chroot-installation: install 'firefox' on buster+sid and 'iceweasel' on jessie+stretch

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
a910e508 by Holger Levsen at 2018-10-11T16:48:38Z
chroot-installation: install 'firefox' on buster+sid and 'iceweasel' on jessie+stretch

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/chroot-installation.sh


Changes:

=====================================
bin/chroot-installation.sh
=====================================
@@ -208,15 +208,19 @@ case $1 in
 	jessie)		DISTRO="jessie"
 			SPECIFIC="libreoffice virt-manager mplayer2 chromium"
 			LXQT="" # not present in jessie
+			FIREFOX="iceweasel"
 			;;
 	stretch)	DISTRO="stretch"
 			SPECIFIC="libreoffice virt-manager mplayer chromium"
+			FIREFOX="iceweasel"
 			;;
 	buster)		DISTRO="buster"
 			SPECIFIC="libreoffice virt-manager mplayer chromium"
+			FIREFOX="firefox"
 			;;
 	sid)		DISTRO="sid"
 			SPECIFIC="libreoffice virt-manager mplayer chromium"
+			FIREFOX="firefox"
 			;;
 	*)		echo "unsupported distro."
 			exit 1
@@ -225,7 +229,7 @@ esac
 bootstrap $DISTRO
 
 if [ "$2" != "" ] ; then
-	FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde $LXQT vlc evince iceweasel cups build-essential devscripts wine texlive-full asciidoc vim emacs"
+	FULL_DESKTOP="$SPECIFIC desktop-base gnome kde-plasma-desktop kde-full kde-standard xfce4 lxde $LXQT vlc evince $FIREFOX cups build-essential devscripts wine texlive-full asciidoc vim emacs"
 	case $2 in
 		none)		;;
 		gnome)		install_packages gnome gnome desktop-base



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/a910e5085f638e9c0f0fe76c28d07e1442ef31d5

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/a910e5085f638e9c0f0fe76c28d07e1442ef31d5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181011/1280c63a/attachment-0001.html>