From 20b068ddaf65afaf8906e44d935cc1ce81471773 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 7 Mar 2017 17:39:45 +0000
Subject: [PATCH] Fix upgrade script-library check

The script-library check is supposed to use a function
available in the library in order to validate that the
library has been loaded, and to fall back to loading
the library.

Currently this does not happen, so the library is never
loaded.

Change-Id: I8ce788448026fd26ade0c4e8b2895a0c89e62604
---
 scripts/run-upgrade.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh
index 1a30e0b96e..cdb8354e9e 100755
--- a/scripts/run-upgrade.sh
+++ b/scripts/run-upgrade.sh
@@ -100,7 +100,10 @@ function check_for_current {
 
 function pre_flight {
     ## Library Check -------------------------------------------------------------
-    echo "Checking for required libraries." 2> /dev/null || source "$(dirname "${0}")/scripts-library.sh"
+
+    info_block "Checking for required libraries." 2> /dev/null ||
+        source ${SCRIPTS_PATH}/scripts-library.sh
+
     ## Pre-flight Check ----------------------------------------------------------
     # Clear the screen and make sure the user understands whats happening.
     clear