From 894c2dc1a71ac2d4043518b597d831cf6b1e424c Mon Sep 17 00:00:00 2001
From: Guillaume Chatelet <gchatelet@google.com>
Date: Fri, 16 Feb 2018 16:45:33 +0100
Subject: [PATCH] Fix shellcheck warnings.

---
 .travis.yml                |  2 +-
 scripts/run_integration.sh | 47 +++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e849466..22b0d1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ sudo: false
 
 cache:
   directories:
-    - $HOME/archives
+    - $HOME/cpu_features_archives
 
 matrix:
   include:
diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh
index b66521b..23755ef 100755
--- a/scripts/run_integration.sh
+++ b/scripts/run_integration.sh
@@ -2,15 +2,15 @@
 
 readonly SCRIPT_FOLDER=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 readonly PROJECT_FOLDER="${SCRIPT_FOLDER}/.."
-readonly ARCHIVE_FOLDER=~/archives
+readonly ARCHIVE_FOLDER=~/cpu_features_archives
 readonly QEMU_INSTALL=${ARCHIVE_FOLDER}/qemu
 readonly DEFAULT_CMAKE_ARGS=" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON"
 
 function extract() {
   case $1 in
-    *.tar.bz2)   tar xjf $1    ;;
-    *.tar.xz)    tar xJf $1    ;;
-    *.tar.gz)    tar xzf $1    ;;
+    *.tar.bz2)   tar xjf "$1"    ;;
+    *.tar.xz)    tar xJf "$1"    ;;
+    *.tar.gz)    tar xzf "$1"    ;;
     *)
       echo "don't know how to extract '$1'..."
       exit 1
@@ -18,21 +18,22 @@ function extract() {
 }
 
 function unpackifnotexists() {
-  mkdir -p ${ARCHIVE_FOLDER}
-  cd ${ARCHIVE_FOLDER}
+  mkdir -p "${ARCHIVE_FOLDER}"
+  cd "${ARCHIVE_FOLDER}" || exit
   local URL=$1
-  local DESTINATION=`pwd`/$2
+  local RELATIVE_FOLDER=$2
+  local DESTINATION="${ARCHIVE_FOLDER}/${RELATIVE_FOLDER}"
   if [[  ! -d "${DESTINATION}" ]] ; then
-    local ARCHIVE_NAME=`echo ${URL} | sed 's/.*\///'`
-    test -f ${ARCHIVE_NAME} || wget ${URL}
-    extract ${ARCHIVE_NAME}
+    local ARCHIVE_NAME=$(echo ${URL} | sed 's/.*\///')
+    test -f "${ARCHIVE_NAME}" || wget -q "${URL}"
+    extract "${ARCHIVE_NAME}"
   fi
 }
 
 function installqemuifneeded() {
   local VERSION=${QEMU_VERSION:=2.11.1}
   local ARCHES=${QEMU_ARCHES:=arm aarch64 i386 x86_64 mips mipsel}
-  local TARGETS=${QEMU_TARGETS:=$(echo $ARCHES | sed 's#$# #;s#\([^ ]*\) #\1-linux-user #g')}
+  local TARGETS=${QEMU_TARGETS:=$(echo "$ARCHES" | sed 's#$# #;s#\([^ ]*\) #\1-linux-user #g')}
 
   if echo "${VERSION} ${TARGETS}" | cmp --silent ${QEMU_INSTALL}/.build -; then
     echo "qemu ${VERSION} up to date!"
@@ -48,7 +49,7 @@ function installqemuifneeded() {
   local QEMU_URL="http://wiki.qemu-project.org/download/qemu-${VERSION}.tar.xz"
   local QEMU_FOLDER="qemu-${VERSION}"
   unpackifnotexists ${QEMU_URL} ${QEMU_FOLDER}
-  cd ${QEMU_FOLDER}
+  cd ${QEMU_FOLDER} || exit
 
   ./configure \
     --prefix="${QEMU_INSTALL}" \
@@ -70,13 +71,13 @@ function installqemuifneeded() {
 
 function assert_defined(){
   local VALUE=${1}
-  : ${VALUE?"${1} needs to be defined"}
+  : "${VALUE?"${1} needs to be defined"}"
 }
 
 function integrate() {
-  cd ${PROJECT_FOLDER}
-  cmake -H. -B${BUILD_DIR} ${DEFAULT_CMAKE_ARGS} ${CMAKE_ADDITIONAL_ARGS}
-  cmake --build ${BUILD_DIR} --target all
+  cd "${PROJECT_FOLDER}" || exit
+  cmake -H. -B"${BUILD_DIR}" ${DEFAULT_CMAKE_ARGS} ${CMAKE_ADDITIONAL_ARGS}
+  cmake --build "${BUILD_DIR}" --target all
 
   if [[ -n "${QEMU_ARCH}" ]]; then
     if [[ "${QEMU_ARCH}" == "DISABLED" ]]; then
@@ -91,7 +92,7 @@ function integrate() {
   # Run tests
   for test_binary in ${BUILD_DIR}/test/*_test; do ${QEMU} ${test_binary}; done
   # Run demo program
-  ${QEMU} ${BUILD_DIR}/list_cpu_features
+  ${QEMU} "${BUILD_DIR}/list_cpu_features"
 }
 
 function expand_linaro_config() {
@@ -99,12 +100,12 @@ function expand_linaro_config() {
   local LINARO_ROOT_URL=https://releases.linaro.org/components/toolchain/binaries/7.2-2017.11
 
   local GCC_URL=${LINARO_ROOT_URL}/${TARGET}/gcc-linaro-7.2.1-2017.11-x86_64_${TARGET}.tar.xz
-  local GCC_RELATIVE_FOLDER=gcc-linaro-7.2.1-2017.11-x86_64_${TARGET}
-  unpackifnotexists ${GCC_URL} ${GCC_RELATIVE_FOLDER}
+  local GCC_RELATIVE_FOLDER="gcc-linaro-7.2.1-2017.11-x86_64_${TARGET}"
+  unpackifnotexists "${GCC_URL}" "${GCC_RELATIVE_FOLDER}"
 
   local SYSROOT_URL=${LINARO_ROOT_URL}/${TARGET}/sysroot-glibc-linaro-2.25-2017.11-${TARGET}.tar.xz
   local SYSROOT_RELATIVE_FOLDER=sysroot-glibc-linaro-2.25-2017.11-${TARGET}
-  unpackifnotexists ${SYSROOT_URL} ${SYSROOT_RELATIVE_FOLDER}
+  unpackifnotexists "${SYSROOT_URL}" "${SYSROOT_RELATIVE_FOLDER}"
 
   local SYSROOT_FOLDER=${ARCHIVE_FOLDER}/${SYSROOT_RELATIVE_FOLDER}
   local GCC_FOLDER=${ARCHIVE_FOLDER}/${GCC_RELATIVE_FOLDER}
@@ -129,11 +130,11 @@ function expand_codescape_config() {
   
   local GCC_URL=${CODESCAPE_URL}
   local GCC_RELATIVE_FOLDER=${TARGET}/${DATE}
-  unpackifnotexists ${GCC_URL} ${GCC_RELATIVE_FOLDER}
+  unpackifnotexists "${GCC_URL}" "${GCC_RELATIVE_FOLDER}"
 
   local SYSROOT_URL=${CODESCAPE_URL}
   local SYSROOT_FOLDER=${ARCHIVE_FOLDER}/${GCC_RELATIVE_FOLDER}/sysroot/${FLAVOUR}
-  unpackifnotexists ${SYSROOT_URL} ${SYSROOT_RELATIVE_FOLDER}
+  unpackifnotexists "${SYSROOT_URL}" "${SYSROOT_RELATIVE_FOLDER}"
 
   CMAKE_ADDITIONAL_ARGS+=" -DENABLE_MSA=1"
   CMAKE_ADDITIONAL_ARGS+=" -DMIPS_CPU=p5600"
@@ -151,7 +152,7 @@ function expand_environment_and_integrate() {
   assert_defined TARGET
 
   BUILD_DIR="${PROJECT_FOLDER}/cmake_build/${TARGET}"
-  mkdir -p ${BUILD_DIR}
+  mkdir -p "${BUILD_DIR}"
 
   CMAKE_ADDITIONAL_ARGS=""
   QEMU_ARGS=""