From c6f5b04a53d3b5063ffc23f141645dc32156ebb2 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 2 Feb 2017 22:14:46 +0100
Subject: [PATCH] setup-ubuntu.sh: Use shorter string concatenation

---
 scripts/setup-ubuntu.sh | 57 +++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
index fd46696b..7d2c4aac 100755
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@@ -1,33 +1,34 @@
-#!/bin/sh
+#!/bin/bash
+set -e -u
 
 PACKAGES=""
-PACKAGES="$PACKAGES ant"			# Used by jack and aptsigner.
-PACKAGES="$PACKAGES asciidoc"
-PACKAGES="$PACKAGES automake"
-PACKAGES="$PACKAGES bison"
-PACKAGES="$PACKAGES clang"			# Used by golang, useful to have same compiler building.
-PACKAGES="$PACKAGES curl"			# Used for fetching sources.
-PACKAGES="$PACKAGES flex"
-PACKAGES="$PACKAGES gettext"			# Provides 'msgfmt' which the apt build uses.
-PACKAGES="$PACKAGES git"			# Used by the neovim build.
-PACKAGES="$PACKAGES help2man"
-PACKAGES="$PACKAGES intltool"			# Used by qalc build.
-PACKAGES="$PACKAGES libgdk-pixbuf2.0-dev"	# Provides 'gkd-pixbuf-query-loaders' which the librsvg build uses.
-PACKAGES="$PACKAGES libglib2.0-dev"		# Provides 'glib-genmarshal' which the glib build uses.
-PACKAGES="$PACKAGES libtool-bin"
-PACKAGES="$PACKAGES lzip"
-PACKAGES="$PACKAGES python3.6"
-PACKAGES="$PACKAGES subversion"			# Used by the netpbm build.
-PACKAGES="$PACKAGES tar"
-PACKAGES="$PACKAGES unzip"
-PACKAGES="$PACKAGES m4"
-PACKAGES="$PACKAGES openjdk-8-jdk"		# Used for android-sdk.
-PACKAGES="$PACKAGES pkg-config"
-PACKAGES="$PACKAGES python-docutils"		# For rst2man, used by mpv.
-PACKAGES="$PACKAGES scons"
-PACKAGES="$PACKAGES texinfo"
-PACKAGES="$PACKAGES xmlto"
-PACKAGES="$PACKAGES xutils-dev"			# Provides 'makedepend' which the openssl build uses.
+PACKAGES+=" ant" # Used by jack and aptsigner.
+PACKAGES+=" asciidoc"
+PACKAGES+=" automake"
+PACKAGES+=" bison"
+PACKAGES+=" clang" # Used by golang, useful to have same compiler building.
+PACKAGES+=" curl" # Used for fetching sources.
+PACKAGES+=" flex"
+PACKAGES+=" gettext" # Provides 'msgfmt' which the apt build uses.
+PACKAGES+=" git" # Used by the neovim build.
+PACKAGES+=" help2man"
+PACKAGES+=" intltool" # Used by qalc build.
+PACKAGES+=" libgdk-pixbuf2.0-dev" # Provides 'gkd-pixbuf-query-loaders' which the librsvg build uses.
+PACKAGES+=" libglib2.0-dev" # Provides 'glib-genmarshal' which the glib build uses.
+PACKAGES+=" libtool-bin"
+PACKAGES+=" lzip"
+PACKAGES+=" python3.6"
+PACKAGES+=" subversion" # Used by the netpbm build.
+PACKAGES+=" tar"
+PACKAGES+=" unzip"
+PACKAGES+=" m4"
+PACKAGES+=" openjdk-8-jdk" # Used for android-sdk.
+PACKAGES+=" pkg-config"
+PACKAGES+=" python-docutils" # For rst2man, used by mpv.
+PACKAGES+=" scons"
+PACKAGES+=" texinfo"
+PACKAGES+=" xmlto"
+PACKAGES+=" xutils-dev" # Provides 'makedepend' which the openssl build uses.
 
 DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq $PACKAGES
 
-- 
2.11.0