fixed weird indentation fails and added 'set -eu -o pipefail' at the top of the script

This commit is contained in:
Michael Rodler 2016-06-01 15:00:45 +02:00
parent 6dd094a8a9
commit 98c76cefde

View file

@ -1,5 +1,6 @@
#!/bin/bash -e
# set -evx
#!/bin/bash
set -eu -o pipefail
# set -x
function usage()
{
@ -47,8 +48,7 @@ function base_build_setup_ubuntu()
PACKAGE_COUNT=$(echo $PACKAGE_REQS | tr ' ' '\n' | wc -l)
if [ $(dpkg -l $PACKAGE_REQS | grep "^ii" | wc -l) -ne $PACKAGE_COUNT ]
then
if [ "$ALLOW_SUDO" -eq 1 ]
then
if [ "$ALLOW_SUDO" -eq 1 ]; then
sudo apt-get -y install $PACKAGE_REQS
else
TOOL=SETUP tool_log "Please install the following packages: $PACKAGE_REQS"
@ -78,10 +78,8 @@ function base_build_setup_arch()
TOOL=SETUP tool_log "Please install the following packages: $PACKAGE_REQS"
fi
if ! grep "^\[multilib\]$" /etc/pacman.conf >/dev/null; then
if [ "$ALLOW_SUDO" -eq 1 ]
then
if [ "$ALLOW_SUDO" -eq 1 ]; then
sudo sh -c 'cat >> /etc/pacman.conf' <<EOF
[multilib]