improved navigation by mentioning script current and next script name

9 files changed, 22 insertions, 18 deletions

diff --git a/1-prereqs.sh b/1-prereqs.sh
index a751b2e..0148464 100755
--- a/1-prereqs.sh
+++ b/1-prereqs.sh
@@ -3,7 +3,7 @@
 source ./auto/helper-logic
 
 # Clear the screen and print the header
-PrintHeader
+PrintHeader "1-prereqs.sh"
 
 # Ensure we are running as root
 EnsureRoot
@@ -245,7 +245,7 @@ fi
 
 echo
 echo "Part 1 of the installer is now done."
-echo "Please run part two to set up Jenkins."
+echo "Please run part two (2-jenkins.sh) to set up Jenkins."
 
 # Create marker file
 CreateMarkerFile 1
\ No newline at end of file
diff --git a/2-jenkins.sh b/2-jenkins.sh
index dc54f0f..5febc6a 100755
--- a/2-jenkins.sh
+++ b/2-jenkins.sh
@@ -3,7 +3,7 @@
 source ./auto/helper-logic
 
 # Clear the screen and print the header
-PrintHeader
+PrintHeader "2-jenkins.sh"
 
 # Ensure we are running as root
 EnsureRoot
@@ -339,7 +339,7 @@ fi
 
 echo
 echo "Part 2 of the installer is now done."
-echo "Please run part three to set up the reprepro repositories."
+echo "Please run part three (3-repositories.sh) to set up the reprepro repositories."
 
 # Create marker file
 CreateMarkerFile 2
\ No newline at end of file
diff --git a/3-repositories.sh b/3-repositories.sh
index 384a71d..219fea5 100755
--- a/3-repositories.sh
+++ b/3-repositories.sh
@@ -3,7 +3,7 @@
 source ./auto/helper-logic
 
 # Clear the screen and print the header
-PrintHeader
+PrintHeader "3-repositories.sh"
 
 # Ensure we are running as root
 EnsureRoot
@@ -104,7 +104,7 @@ chown -R jenkins:jenkins /home/sentrium
 
 echo
 echo "Part 3 of the installer is now done."
-echo "Please run part four to set up uncron."
+echo "Please run part four (4-uncron.sh) to set up uncron."
 
 # Create marker file
 CreateMarkerFile 3
\ No newline at end of file
diff --git a/4-uncron.sh b/4-uncron.sh
index f5076bf..51e0598 100755
--- a/4-uncron.sh
+++ b/4-uncron.sh
@@ -3,7 +3,7 @@
 source ./auto/helper-logic
 
 # Clear the screen and print the header
-PrintHeader
+PrintHeader "4-uncron.sh"
 
 # Ensure we are running as root
 EnsureRoot
@@ -84,7 +84,7 @@ systemctl enable --now uncron.service > /dev/null 2>&1
 
 echo
 echo "Part 4 of the installer is now done."
-echo "Please run part five to set up the vyos build container jobs."
+echo "Please run part five (5-docker-jobs.sh) to set up the vyos build container jobs."
 
 # Create marker file
 CreateMarkerFile 4
\ No newline at end of file
diff --git a/5-docker-jobs.sh b/5-docker-jobs.sh
index 57640dd..3ef1d49 100755
--- a/5-docker-jobs.sh
+++ b/5-docker-jobs.sh
@@ -3,7 +3,7 @@
 source ./auto/helper-logic
 
 # Clear the screen and print the header
-PrintHeader
+PrintHeader "5-docker-jobs.sh"
 
 # Ensure we are running as root
 EnsureRoot
@@ -45,13 +45,13 @@ if [ $? -eq 0 ]; then
   echo
   echo "Containers has been built."
   echo "Part 5 of the installer is now done."
-  echo "Please run part six to set up the project jobs."
+  echo "Please run part six (6-provision-project-jobs.sh) to set up the project jobs."
   echo
 else
   echo
   echo "One or more container failed to build."
   echo "Please check inside Jenkins to see what went wrong, and run a new build of the failed container."
-  echo "Once this is done, please run part six to set up the project job."
+  echo "Once this is done, please run part six (6-provision-project-jobs.sh) to set up the project job."
   echo
 fi
 
diff --git a/6-provision-project-jobs.sh b/6-provision-project-jobs.sh
index 876fd93..32b5f3e 100755
--- a/6-provision-project-jobs.sh
+++ b/6-provision-project-jobs.sh
@@ -3,7 +3,7 @@
 source ./auto/helper-logic
 
 # Clear the screen and print the header
-PrintHeader
+PrintHeader "6-provision-project-jobs.sh"
 
 # Ensure we are running as root
 EnsureRoot
@@ -39,7 +39,7 @@ ProvisionJobs "jobs/project-jobs.json"
 echo
 echo "The project jobs has been provisioned."
 echo "Part 6 of the installer is now done."
-echo "Please run part seven to build the project jobs."
+echo "Please run part seven (7-build-project-jobs.sh) to build the project jobs."
 
 # Create marker file
 CreateMarkerFile 6
\ No newline at end of file
diff --git a/7-build-project-jobs.sh b/7-build-project-jobs.sh
index 4749bda..824915e 100755
--- a/7-build-project-jobs.sh
+++ b/7-build-project-jobs.sh
@@ -3,7 +3,7 @@
 source ./auto/helper-logic
 
 # Clear the screen and print the header
-PrintHeader
+PrintHeader "7-build-project-jobs.sh"
 
 # Ensure we are running as root
 EnsureRoot
@@ -40,14 +40,14 @@ if [ $? -eq 0 ]; then
   echo
   echo "All packages have been built."
   echo "Part 7 of the installer is now done."
-  echo "Please run part eight to set up NGINX."
+  echo "Please run part eight (8-nginx.sh) to set up NGINX."
   echo
 else
   echo
   echo "One or more packages failed to build."
   echo "A list of failed jobs is printed above."
   echo "Please check inside Jenkins to see what went wrong, and run a new build of the failed package."
-  echo "Once this is done, please run part eight to set up NGINX."
+  echo "Once this is done, please run part eight (8-nginx.sh) to set up NGINX."
   echo
 fi
 
diff --git a/8-nginx.sh b/8-nginx.sh
index 7fe268c..0eab73d 100755
--- a/8-nginx.sh
+++ b/8-nginx.sh
@@ -3,7 +3,7 @@
 source ./auto/helper-logic
 
 # Clear the screen and print the header
-PrintHeader
+PrintHeader "8-nginx.sh"
 
 # Ensure we are running as root
 EnsureRoot
@@ -75,7 +75,7 @@ Run "RestartNginx" \
 
 echo
 echo "Part 8 of the installer is now done."
-echo "The installation is now done - you can build the ISO by running the build-iso bash script."
+echo "The installation is now done - you can build the ISO by running the build-iso.sh bash script."
 
 # Create marker file
 CreateMarkerFile 8
\ No newline at end of file
diff --git a/auto/helper-logic b/auto/helper-logic
index 6fcc1de..5a321f3 100644
--- a/auto/helper-logic
+++ b/auto/helper-logic
@@ -39,6 +39,10 @@ function PrintHeader {
   echo "# Unofficial VyOS package mirror installer v1.0 #"
   echo "#################################################"
   echo
+  if [ "$1" != "" ]; then
+      echo "Currently running $1"
+      echo
+  fi
 }
 
 function EnsureRoot {