scripts/vagrant: fix mixed spaces and tabs
Use tabs in all vagrant script files for indentation. Change-Id: Iaf238b742b4958ea31f31ebe2d0f352944cb3d57 Signed-off-by: Karol Latecki <karol.latecki@intel.com> Reviewed-on: https://review.gerrithub.io/421511 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Seth Howell <seth.howell5141@gmail.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
parent
808b47c3aa
commit
23ef5c447b
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user