From c0a6596e29baceb1717a94d9f66f602ac8f355e9 Mon Sep 17 00:00:00 2001 From: Jokin Garay Date: Thu, 9 Mar 2017 14:51:48 +0100 Subject: [PATCH] Change 1247: Move lxd check to installation start Change-Id: I2ca825c7b80f0641e3c3c49541da9561c39c206d Signed-off-by: Jokin Garay --- installers/install_from_source.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installers/install_from_source.sh b/installers/install_from_source.sh index 80790c4a..02d9e05a 100755 --- a/installers/install_from_source.sh +++ b/installers/install_from_source.sh @@ -245,9 +245,6 @@ if [ -z "$TEST_INSTALLER" ]; then RC_CLONE=$? fi -echo -e "Checking required packages: lxd" -lxd --version &>/dev/null || echo -e "lxd not present, exiting " >&2 && exit 1 - echo -e "\nGuessing the current stable release" LATEST_STABLE_DEVOPS=`git -C $TEMPDIR tag -l v[0-9].* | tail -n1` [ -z "$COMMIT_ID" ] && [ -z "$LATEST_STABLE_DEVOPS" ] && echo "Could not find the current latest stable release" && exit 0 @@ -282,6 +279,9 @@ if [ -z "$ASSUME_YES" ]; then [ "$USER_CONFIRMATION" != "y" ] && echo "Cancelled!" && exit 0 fi +echo -e "Checking required packages: lxd" +lxd --version &>/dev/null || echo -e "lxd not present, exiting " >&2 && exit 1 + [ -z "$COMMIT_ID" ] && [ -n "$LATEST_STABLE_DEVOPS" ] && COMMIT_ID="tags/$LATEST_STABLE_DEVOPS" echo -e "\n Installing OSM from refspec: $COMMIT_ID" -- 2.25.1