From 23ef5c447b0e1415d5d9527d6af642603550c70b Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Tue, 7 Aug 2018 16:09:21 +0200 Subject: [PATCH] scripts/vagrant: fix mixed spaces and tabs Use tabs in all vagrant script files for indentation. Change-Id: Iaf238b742b4958ea31f31ebe2d0f352944cb3d57 Signed-off-by: Karol Latecki Reviewed-on: https://review.gerrithub.io/421511 Tested-by: SPDK CI Jenkins Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Seth Howell Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- scripts/vagrant/create_vbox.sh | 6 +++--- scripts/vagrant/run-autorun.sh | 18 +++++++++--------- scripts/vagrant/update.sh | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/vagrant/create_vbox.sh b/scripts/vagrant/create_vbox.sh index 88f5647db..b170d0e0f 100755 --- a/scripts/vagrant/create_vbox.sh +++ b/scripts/vagrant/create_vbox.sh @@ -98,9 +98,9 @@ case "$SPDK_VAGRANT_DISTRO" in fedora27) export SPDK_VAGRANT_DISTRO ;; - freebsd11) - export SPDK_VAGRANT_DISTRO - ;; + freebsd11) + export SPDK_VAGRANT_DISTRO + ;; *) echo " Invalid argument \"${SPDK_VAGRANT_DISTRO}\"" echo " Try: \"$0 -h\"" >&2 diff --git a/scripts/vagrant/run-autorun.sh b/scripts/vagrant/run-autorun.sh index d01096c70..178bdbcc3 100755 --- a/scripts/vagrant/run-autorun.sh +++ b/scripts/vagrant/run-autorun.sh @@ -106,10 +106,10 @@ case "$METHOD" in echo "${SPDK_SOURCE_PATH} does not exist!" exit 1 fi - if [ ! -d "${SPDK_SOURCE_PATH}/.git" ]; then - echo "${SPDK_SOURCE_PATH} is not a git repository" - exit 1 - fi + if [ ! -d "${SPDK_SOURCE_PATH}/.git" ]; then + echo "${SPDK_SOURCE_PATH} is not a git repository" + exit 1 + fi GIT_REPO_SRC_DIR=$($READLINK -f "${SPDK_SOURCE_PATH}" | tr -t '/' ' ' | awk '{print $NF}') @@ -118,14 +118,14 @@ case "$METHOD" in exit 1 fi - pushd "${SPDK_SOURCE_PATH}" - GIT_REPO_SRC=$(git rev-parse --show-toplevel) + pushd "${SPDK_SOURCE_PATH}" + GIT_REPO_SRC=$(git rev-parse --show-toplevel) GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) - popd + popd if [ "${SPDK_AUTOTEST_LOCAL_PATH}" = "${SPDK_SOURCE_PATH}" ]; then SPDK_AUTOTEST_LOCAL_PATH=$($READLINK -f ${SPDK_AUTOTEST_LOCAL_PATH}/..) - echo "Set SPDK_AUTOTEST_LOCAL_PATH to ${SPDK_AUTOTEST_LOCAL_PATH}" + echo "Set SPDK_AUTOTEST_LOCAL_PATH to ${SPDK_AUTOTEST_LOCAL_PATH}" fi if [ -d "${SPDK_AUTOTEST_LOCAL_PATH}/${GIT_BRANCH}" ]; then @@ -165,7 +165,7 @@ fi # I'd like to keep these files under source control # if [[ -e "${AUTOTEST_DRIVER_PATH}/autorun-spdk.conf" ]]; then - conf="${AUTOTEST_DRIVER_PATH}/autorun-spdk.conf" + conf="${AUTOTEST_DRIVER_PATH}/autorun-spdk.conf" fi if [[ -e ~/autorun-spdk.conf ]]; then conf=~/autorun-spdk.conf diff --git a/scripts/vagrant/update.sh b/scripts/vagrant/update.sh index b2ffbca6b..681fd9dc5 100755 --- a/scripts/vagrant/update.sh +++ b/scripts/vagrant/update.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash if [ ! "$USER" = "root" ]; then - echo - echo Error: must be run as root! - echo - exit 1 + echo + echo Error: must be run as root! + echo + exit 1 fi set -e