vagrant: Use debian-setup.sh

Change-Id: Idb6c9281d050e89dc8eb564fe9d35ce1d4a27d8a
Reviewed-on: https://code.wireshark.org/review/29356
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/Vagrantfile b/Vagrantfile
index cf129a2195e93ccedff3e62521fd783688c0ef6a..c3d74bdaa2fdc4cf53076f78acebf1956f1e4fad 100644 (file)
--- 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 2321afe7032eb0bcbe363c3289e3577d73368568..de39e50474f7a2e13b42013a3281315585688a0f 100755 (executable)
--- 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 (file)
index c13ba1a..0000000
--- 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