From 00faf4f9d5ee25a37e0804ebb5807b29bd94ae29 Mon Sep 17 00:00:00 2001
From: PorridgePi <kunbao2006@126.com>
Date: Mon, 26 Sep 2022 14:09:05 +0100
Subject: [PATCH] vm: chore: Cleanup code and print messages

---
 vm/src/setup.sh | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/vm/src/setup.sh b/vm/src/setup.sh
index 4e4045f..3264633 100644
--- a/vm/src/setup.sh
+++ b/vm/src/setup.sh
@@ -5,27 +5,25 @@ PASSWORD=pass
 
 if [ ! -f '/SETUP_DONE' ]; then
     echo '########################################'
-    echo 'SETUP NOT DONE'
+    echo '####       SETUP NOT COMPLETE       ####'
     echo '########################################'
+    echo
+    echo 'Starting setup...'
 
     echo
     echo '########################################'
-    echo '1. Starting setup...'
-
-    echo
-    echo '########################################'
-    echo "2. Apt update and upgrade"
+    echo "1. Apt update and upgrade"
     apt update
     apt upgrade -y
 
     echo
     echo '########################################'
-    echo "3. Apt install"
+    echo "2. Apt install"
     apt install -y sudo nano git
 
     echo
     echo '########################################'
-    echo "4. Add user"
+    echo "3. Add user"
     # add user, create home dir (-m), set password (-p), add to group sudo (-g)
     useradd -m -p $(perl -e "print crypt($PASSWORD, 'password')") -g sudo $USERNAME
 
@@ -35,20 +33,21 @@ if [ ! -f '/SETUP_DONE' ]; then
     touch /SETUP_DONE
 else
     echo '########################################'
-    echo "SETUP IS COMPLETED"
+    echo '####       SETUP IS COMPLETED       ####'
     echo '########################################'
     echo
     echo "Skipping setup..."
 fi
 
-echo
-echo '####################'
-echo '####  ALL DONE  ####'
-echo '####################'
-echo
-
 # Set bash as default shell
 su - $USERNAME -c "echo $PASSWORD | chsh -s \$(which bash) \$USER"
 
+echo
+echo
+echo '########################################'
+echo '####            ALL DONE            ####'
+echo '########################################'
+echo
+
 # Login as user
 su --login $USERNAME