diff options
-rw-r--r-- | Vagrantfile | 5 | ||||
-rwxr-xr-x | tools/debian-setup.sh | 1 | ||||
-rw-r--r-- | vagrant_provision.sh | 17 |
3 files changed, 5 insertions, 18 deletions
diff --git a/Vagrantfile b/Vagrantfile index cf129a2195..c3d74bdaa2 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -19,6 +19,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.ssh.forward_x11 = true # Install and build the various things (including wireshark!) - config.vm.provision :shell, path: 'vagrant_provision.sh' + config.vm.provision "shell" do |s| + s.path = 'tools/debian-setup.sh' + s.args = ['--install-optional', '--assume-yes'] + end config.vm.provision :shell, path: 'vagrant_build.sh', privileged: false end diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh index 2321afe703..de39e50474 100755 --- a/tools/debian-setup.sh +++ b/tools/debian-setup.sh @@ -125,6 +125,7 @@ then fi # shellcheck disable=SC2086 +apt-get update || exit 2 apt-get install $ACTUAL_LIST $OPTIONS || exit 2 if [ ! $ADDITIONAL ] diff --git a/vagrant_provision.sh b/vagrant_provision.sh deleted file mode 100644 index c13ba1ab39..0000000000 --- a/vagrant_provision.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -# Copyright 2015 Evan Huus <eapache@gmail.com> -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# SPDX-License-Identifier: GPL-2.0-or-later - -set -e - -apt-get update -apt-get build-dep -y wireshark -apt-get install -y git cmake valgrind qt5-default \ - libqt5multimedia5 qtmultimedia5-dev \ - libqt5svg5-dev qttools5-dev qttools5-dev-tools |