Merge ~kajiya/+git/next-demo:additonal-edits-for-kara into ~kajiya/+git/next-demo:main

[Chloé Smith]

feat: Pin to an older focal image and add more meat to on-instance.sh

* Do an apt update and install additional packages for a more verbose
  pro status
* Minor tweaks (added -r to prevent backclashes being globbed on
  `read`), etc.

[Ankush Pathak (ankushpathak)]

review: Approve

diff --git a/main.sh b/main.sh
index 3d3781a..f1c099f 100755
--- a/main.sh
+++ b/main.sh
@@ -2,7 +2,7 @@
 
 INSTANCE_NAME=focal-$(petname)
 ZONE="us-central1-a"
-FAMILY="ubuntu-2004-lts"
+IMAGE_NAME="ubuntu-2004-focal-v20231213"
 PROJECT="${1}"
 
 PUB_KEYNAME=${INSTANCE_NAME}.rsa.pub
@@ -42,9 +42,10 @@ launch_instance(){
   touch ${INSTANCE_NAME}_hosts_file
   ssh-keygen -t rsa -f ${INSTANCE_NAME}.rsa -C ubuntu -b 2048 -N ""
 
-  gcloud compute os-login ssh-keys add --key-file=${PUB_KEYNAME}   --project=${PROJECT} --ttl=2h
-
-  gcloud compute instances create ${INSTANCE_NAME} --machine-type n2d-standard-4   --project ${PROJECT} --image-family ${FAMILY} --image-project=ubuntu-os-cloud   --zone ${ZONE} --metadata=ssh-keys=${PRIVATE_KEYNAME}
+  gcloud compute instances create ${INSTANCE_NAME} --machine-type n2d-standard-4 --project ${PROJECT} --image ${IMAGE_NAME} --image-project=ubuntu-os-cloud --zone ${ZONE} --metadata=ssh-keys=${PRIVATE_KEYNAME},startup-script='#! /bin/bash
+  apt update
+  apt -y install mongodb ros-base-python-dev
+  EOF'
 
   echo "Waiting for instance to launch..."
 
@@ -67,7 +68,7 @@ launch_instance(){
 while true; do
   clear
   printf "Press any key to begin."
-  read
+  read -r
   launch_instance
   if command -v cowsay >/dev/null;
   then
diff --git a/on-instance.sh b/on-instance.sh
index 5bca750..8fdeb28 100644
--- a/on-instance.sh
+++ b/on-instance.sh
@@ -4,25 +4,32 @@ set -e
 clear
 
 echo "=========================================================="
-echo "You are on an Ubuntu 20.04 instance on Google Cloud."
-echo "Why do you need Ubuntu Pro? Press enter to run the command"
-printf "\$ pro security-status"
-read
+echo "You are on an Ubuntu 20.04 instance in Google Cloud."
+echo "Why do you need Ubuntu Pro? Type 'pro security-status' and run the command to find out"
+read -r USER_INPUT
+while [ "${USER_INPUT}" != "pro security-status" ]; do
+  echo "Ooops! Please try typing that again."
+  read -r USER_INPUT
+done
+echo "Running ${USER_INPUT}"
 pro security-status
-read -p "Return to continue."
 echo "=========================================================="
 echo "You seem like a Pro. Would you like to make your instance Pro too?"
 printf "\$ sudo pro attach xxxxxxxTOKENxGOESxHERExxxxxxx"
-read
+read -r
 TOKEN=$(cat token)
 sudo pro attach "${TOKEN}"
-read -p "Return to continue."
+read -r -p "Return to continue."
 echo "=========================================================="
 echo "Your instance is now a Pro too."
-echo "Go to ubuntu.com/pro to get your free token. Return to continue."
-read
-read -p "Would you like to switch to a bash session?(y/n)[n]" answer
-if [ "${answer}" != "y" ];
+echo "Let's look at the esm-apps installed..."
+pro security-status --esm-apps
+echo "=========================================================="
+echo "Go to ubuntu.com/pro to get your free token."
+read -r -p "Return to continue."
+echo "=========================================================="
+read -r -p "Would you like to switch to a bash session?(y/n)[n]" ANSWER
+if [ "${ANSWER}" != "y" ];
 then
     exit
 fi