Reformat of displayed messages

scripts/01-renew-ssh-keys

@@ -5,9 +5,9 @@
 # Renews the ssh server keys if they exist
 #
 cat <<EOF
-##################################
-# Renewing SSH server keys       #
-##################################
++---------------------------------------------+
+| Renewing SSH server keys                    |
++---------------------------------------------+
 EOF
 status=0
 renew_ssh_keys(){
@@ -20,11 +20,9 @@ ls /etc/ssh/ssh_host_*key* > /dev/null 2>&1 && renew_ssh_keys || status=1
 if [ 0 -ne "$status" ]
 then
   # Exit with non zero status
-  echo "Error renewing SSH keys"
+  echo "### Error renewing SSH keys    ###"
   exit 1
 else
-  cat <<-EOF
-# Renewing SSH server keys: OK   #
-##################################
-EOF
+  echo "> Renewing SSH server keys : OK               <"
+  exit 0
 fi

scripts/02-password

@@ -5,9 +5,9 @@
 # Changes the root password
 #
 cat <<EOF
-##################################
-# Changing super-user password   #
-##################################
++---------------------------------------------+
+| Changing super-user password                |
++---------------------------------------------+
 EOF
 status=1
 
@@ -17,17 +17,13 @@ do
   status=$?
   if [ 0 -ne "$status" ]
   then
-    echo "Error changing super-user password"
+    echo "### Error changing super-user password ###"
     echo "Please try again"
   else
-    cat <<EOF
-**********************************
-* super-user password : changed  *
-**********************************
-EOF
+    echo "> super-user password : changed           <"
     exit 0
   fi
 done
 
-echo "An error occurred changing super-user password"
+echo "### An error occurred changing super-user password   ###"
 exit $status

scripts/03-user-password

@@ -7,9 +7,9 @@
 # Default user should have id 1000:
 the_user=$(id -u 1000 -n)
 cat <<EOF
-##################################
-# Changing $the_user password #
-##################################
++---------------------------------------------+
+| Changing $the_user password                 |
++---------------------------------------------+
 EOF
 status=1
 while [ 0 -ne "$status" ]
@@ -18,17 +18,13 @@ do
   status=$?
   if [ 0 -ne "$status" ]
   then
-    echo "Error changing $the_user password"
+    echo "### Error changing $the_user password   ###"
     echo "Please try again"
   else
-    cat <<EOF
-**********************************
-* $the_user password : changed  *
-**********************************
-EOF
+    echo "> $the_user password : changed  <"
     exit 0
   fi
 done
 
-echo "An error occurred changing $the_user password"
+echo "### An error occurred changing $the_user password   ###"
 exit $status

scripts/04-create-default-user

@@ -5,9 +5,9 @@
 # Creates a new user for administrative purposes (in sudo group)
 #
 cat <<EOF
-##################################
-# Creating default user          #
-##################################
++---------------------------------------------+
+| Creating default user                       |
++---------------------------------------------+
 EOF
 read -p "Please enter default user name: " the_user
 
@@ -24,9 +24,11 @@ fi
 
 if [ 0 -ne "$status" ]
 then
-  echo "Error creating $the_user"
-  echo "Please try again by rebooting"
+  echo "### Error creating $the_user   ###"
+  echo "### Please try again by rebooting your system  ###"
+  exit 1
 else
+  # Adds new user to sudo group
   adduser $the_user sudo
 fi
 
@@ -37,17 +39,13 @@ do
   status=$?
   if [ 0 -ne "$status" ]
   then
-    echo "Error changing $the_user password"
+    echo "# Error changing $the_user password   #"
     echo "Please try again"
   else
-    cat <<EOF
-************************************
-* $the_user : created successfully *
-************************************
-EOF
+    echo "> $the_user : created successfully <"
     exit 0
   fi
 done
 
-echo "An error occurred changing $the_user password"
+echo "### An error occurred changing $the_user password   ###"
 exit $status

scripts/50-hostname

@@ -5,21 +5,23 @@
 # Changes the machine hostname
 #
 cat <<EOF
-##############################
-# Changing hostname          #
-##############################
++---------------------------------------------+
+| Changing hostname                           |
++---------------------------------------------+
 EOF
 read -p "Please enter new hostname: " answer
 
 if [ -n "$answer" ]
 then
-  echo Changing hostname to $answer
+  echo "Changing hostname to $answer"
   current=$(hostname)
   sed -i.firstboot.backup s/$current/$answer/g /etc/hostname
   sed -i.firstboot.backup s/$current/$answer/g /etc/hosts
   hostname $answer
+  echo "> Hostname changed to $answer <"
   exit 0
 else
   # Exit with non zero status
+  echo "### Could not change hostname   ###"
   exit 1
 fi

scripts/skeleton

@@ -10,9 +10,9 @@
 #
 # Example Section : Displaying a banner
 cat <<EOF
-##############################
-# My Banner                  #
-##############################
++---------------------------------------------+
+| My Banner                                   |
++---------------------------------------------+
 EOF
 # Example Section : asking user to enter a value
 read -p "Please enter a value: " answer
@@ -25,5 +25,6 @@ then
   exit 0
 else
   # Exit with non zero status
+  echo "### Explicit error message   ###"
   exit 1
 fi