From ffa6320bf4fef3cdba4923fd8607a43f30a7ac5a Mon Sep 17 00:00:00 2001
From: joglomedia <eslabs.id@gmail.com>
Date: Tue, 26 Nov 2019 07:30:59 +0700
Subject: [PATCH] fix travis error during build Nginx

---
 scripts/install_nginx.sh | 11 +++++++++--
 shunit2/run_test.sh      | 12 ++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/scripts/install_nginx.sh b/scripts/install_nginx.sh
index f4a8192..486dcd3 100755
--- a/scripts/install_nginx.sh
+++ b/scripts/install_nginx.sh
@@ -569,8 +569,15 @@ function init_nginx_install() {
                     fi
 
                     # Execute nginx from source installer.
-                    run bash "${SCRIPTS_DIR}/install_nginx_from_source.sh" -v latest-stable -n "${NGX_VERSION}" --dynamic-module \
-                        --extra-modules -b "${BUILD_DIR}" -a "${NGX_CONFIGURE_ARGS}" -y
+                    if [ -f "${SCRIPTS_DIR}/install_nginx_from_source.sh" ]; then
+                        run "${SCRIPTS_DIR}/install_nginx_from_source.sh" -v latest-stable -n "${NGX_VERSION}" --dynamic-module \
+                            --extra-modules -b "${BUILD_DIR}" -a "${NGX_CONFIGURE_ARGS}" -y
+                    elif [ -f ".${SCRIPTS_DIR}/install_nginx_from_source.sh" ]; then
+                        run ".${SCRIPTS_DIR}/install_nginx_from_source.sh" -v latest-stable -n "${NGX_VERSION}" --dynamic-module \
+                            --extra-modules -b "${BUILD_DIR}" -a "${NGX_CONFIGURE_ARGS}" -y
+                    else
+                        error "Nginx from source installer not found."
+                    fi
                 fi
 
                 echo "Configuring NGiNX extra modules..."
diff --git a/shunit2/run_test.sh b/shunit2/run_test.sh
index 8ebbbde..9d1ba4a 100755
--- a/shunit2/run_test.sh
+++ b/shunit2/run_test.sh
@@ -9,8 +9,8 @@ nginx_stable_version="1.16.1"
 nginx_latest_version="1.17.6"
 
 # Source the helper functions.
-if [ -f "./scripts/helper.sh" ]; then
-    source ./scripts/helper.sh
+if [ -f scripts/helper.sh ]; then
+    source scripts/helper.sh
     init_log
     init_config
 else
@@ -37,7 +37,7 @@ testEqualityGetReleaseName()
 
 testEqualityCreateAccount()
 {
-    release_name=$(sudo create_account lemper)
+    release_name=$(create_account lemper)
     assertEquals "Username lemper created." "${release_name}"
 }
 
@@ -55,7 +55,7 @@ testEqualityGetNginxLatestVersion()
 
 testEqualityInstallNginx()
 {
-    . ./scripts/install_nginx.sh
+    . scripts/install_nginx.sh
 
     nginx_bin=$(command -v nginx)
     assertEquals "/usr/sbin/nginx" "${nginx_bin}"
@@ -63,7 +63,7 @@ testEqualityInstallNginx()
 
 testEqualityInstallPhp()
 {
-    . ./scripts/install_php.sh
+    . scripts/install_php.sh
 
     php_bin=$(command -v php)
     assertEquals "/usr/bin/php" "${php_bin}"
@@ -71,7 +71,7 @@ testEqualityInstallPhp()
 
 testEqualityInstallMySQL()
 {
-    . ./scripts/install_mariadb.sh
+    . scripts/install_mariadb.sh
 
     mysql_bin=$(command -v mysql)
     assertEquals "/usr/bin/mysql" "${mysql_bin}"