From 1e333d6ee30b142be63f589d9a5d32bbc471b6fb Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@yahoo-inc.com>
Date: Wed, 4 Sep 2019 13:30:35 +0000
Subject: update shell bootstrap sections

---
 vespabase/src/rhel-prestart.sh            | 5 +++++
 vespabase/src/start-cbinaries.sh          | 4 ++++
 vespabase/src/start-tool.sh               | 4 ++++
 vespabase/src/start-vespa-base.sh         | 4 ++++
 vespabase/src/stop-vespa-base.sh          | 4 ++++
 vespabase/src/vespa-start-configserver.sh | 4 ++++
 vespabase/src/vespa-start-services.sh     | 4 ++++
 vespabase/src/vespa-stop-configserver.sh  | 4 ++++
 vespabase/src/vespa-stop-services.sh      | 4 ++++
 9 files changed, 37 insertions(+)

(limited to 'vespabase')

diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh
index 44bf4fd9205..3a770cdd785 100755
--- a/vespabase/src/rhel-prestart.sh
+++ b/vespabase/src/rhel-prestart.sh
@@ -8,6 +8,10 @@ findpath () {
     myname=${0}
     mypath=${myname%/*}
     myname=${myname##*/}
+    empty_if_start_slash=${mypath%%/*}
+    if [ "${empty_if_start_slash}" ]; then
+        mypath=$(pwd)/${mypath}
+    fi
     if [ "$mypath" ] && [ -d "$mypath" ]; then
         return
     fi
@@ -66,6 +70,7 @@ findhost () {
 }
 
 findroot
+findhost
 
 # END environment bootstrap section
 
diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh
index 02eac2f42bc..f17829aa081 100755
--- a/vespabase/src/start-cbinaries.sh
+++ b/vespabase/src/start-cbinaries.sh
@@ -8,6 +8,10 @@ findpath () {
     myname=${0}
     mypath=${myname%/*}
     myname=${myname##*/}
+    empty_if_start_slash=${mypath%%/*}
+    if [ "${empty_if_start_slash}" ]; then
+        mypath=$(pwd)/${mypath}
+    fi
     if [ "$mypath" ] && [ -d "$mypath" ]; then
         return
     fi
diff --git a/vespabase/src/start-tool.sh b/vespabase/src/start-tool.sh
index f3100739cde..b3811939ad7 100755
--- a/vespabase/src/start-tool.sh
+++ b/vespabase/src/start-tool.sh
@@ -8,6 +8,10 @@ findpath () {
     myname=${0}
     mypath=${myname%/*}
     myname=${myname##*/}
+    empty_if_start_slash=${mypath%%/*}
+    if [ "${empty_if_start_slash}" ]; then
+        mypath=$(pwd)/${mypath}
+    fi
     if [ "$mypath" ] && [ -d "$mypath" ]; then
         return
     fi
diff --git a/vespabase/src/start-vespa-base.sh b/vespabase/src/start-vespa-base.sh
index a346854134d..fdda5f85198 100755
--- a/vespabase/src/start-vespa-base.sh
+++ b/vespabase/src/start-vespa-base.sh
@@ -8,6 +8,10 @@ findpath () {
     myname=${0}
     mypath=${myname%/*}
     myname=${myname##*/}
+    empty_if_start_slash=${mypath%%/*}
+    if [ "${empty_if_start_slash}" ]; then
+        mypath=$(pwd)/${mypath}
+    fi
     if [ "$mypath" ] && [ -d "$mypath" ]; then
         return
     fi
diff --git a/vespabase/src/stop-vespa-base.sh b/vespabase/src/stop-vespa-base.sh
index 4e14b51c869..f30faad65ee 100755
--- a/vespabase/src/stop-vespa-base.sh
+++ b/vespabase/src/stop-vespa-base.sh
@@ -8,6 +8,10 @@ findpath () {
     myname=${0}
     mypath=${myname%/*}
     myname=${myname##*/}
+    empty_if_start_slash=${mypath%%/*}
+    if [ "${empty_if_start_slash}" ]; then
+        mypath=$(pwd)/${mypath}
+    fi
     if [ "$mypath" ] && [ -d "$mypath" ]; then
         return
     fi
diff --git a/vespabase/src/vespa-start-configserver.sh b/vespabase/src/vespa-start-configserver.sh
index 3a7416c5162..d6f401ad5d0 100755
--- a/vespabase/src/vespa-start-configserver.sh
+++ b/vespabase/src/vespa-start-configserver.sh
@@ -8,6 +8,10 @@ findpath () {
     myname=${0}
     mypath=${myname%/*}
     myname=${myname##*/}
+    empty_if_start_slash=${mypath%%/*}
+    if [ "${empty_if_start_slash}" ]; then
+        mypath=$(pwd)/${mypath}
+    fi
     if [ "$mypath" ] && [ -d "$mypath" ]; then
         return
     fi
diff --git a/vespabase/src/vespa-start-services.sh b/vespabase/src/vespa-start-services.sh
index ef8a6b55f05..42a98511258 100755
--- a/vespabase/src/vespa-start-services.sh
+++ b/vespabase/src/vespa-start-services.sh
@@ -8,6 +8,10 @@ findpath () {
     myname=${0}
     mypath=${myname%/*}
     myname=${myname##*/}
+    empty_if_start_slash=${mypath%%/*}
+    if [ "${empty_if_start_slash}" ]; then
+        mypath=$(pwd)/${mypath}
+    fi
     if [ "$mypath" ] && [ -d "$mypath" ]; then
         return
     fi
diff --git a/vespabase/src/vespa-stop-configserver.sh b/vespabase/src/vespa-stop-configserver.sh
index a0c3ca7169b..116c1f14617 100755
--- a/vespabase/src/vespa-stop-configserver.sh
+++ b/vespabase/src/vespa-stop-configserver.sh
@@ -8,6 +8,10 @@ findpath () {
     myname=${0}
     mypath=${myname%/*}
     myname=${myname##*/}
+    empty_if_start_slash=${mypath%%/*}
+    if [ "${empty_if_start_slash}" ]; then
+        mypath=$(pwd)/${mypath}
+    fi
     if [ "$mypath" ] && [ -d "$mypath" ]; then
         return
     fi
diff --git a/vespabase/src/vespa-stop-services.sh b/vespabase/src/vespa-stop-services.sh
index 0f1fcd30abe..441717c2a71 100755
--- a/vespabase/src/vespa-stop-services.sh
+++ b/vespabase/src/vespa-stop-services.sh
@@ -8,6 +8,10 @@ findpath () {
     myname=${0}
     mypath=${myname%/*}
     myname=${myname##*/}
+    empty_if_start_slash=${mypath%%/*}
+    if [ "${empty_if_start_slash}" ]; then
+        mypath=$(pwd)/${mypath}
+    fi
     if [ "$mypath" ] && [ -d "$mypath" ]; then
         return
     fi
-- 
cgit v1.2.3