put AWS CLI check and SSH key check in init.sh

treehouses · Feb 22, 2024 · 8998336 · 8998336
1 parent e2dbe9b
commit 8998336
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/aws/init.sh b/src/aws/init.sh
@@ -10,11 +10,7 @@ groupName=luftballons-sg
 instanceName=luftballon
 checkSSH=~/.ssh/$publickey
 
-aws --version || ( echo "Run './installAwsCli.sh' first. AWS CLI is not installed." && exit 1 )
 
-if test ! -f "$checkSSH"; then
-	echo "Run 'ssh-keygen' first, with an empty passphrase for no passphrase. Missing ssh key." && exit 1
-fi
 
 function importSshKey()
 {
@@ -152,6 +148,11 @@ function init {
 	done
 	shift "$(($OPTIND -1))"
 
+	aws --version || ( echo "Run './installAwsCli.sh' first. AWS CLI is not installed." && exit 1 )
+
+	if test ! -f "$checkSSH"; then
+		echo "Run 'ssh-keygen' first, with an empty passphrase for no passphrase. Missing ssh key." && exit 1
+	fi
 
 	if [ -z $keyname ]
 	then