Merge pull request #205 from MrSecure/tweaks

Tweaks - AWS Account ID, -V flag

prowler

@@ -70,12 +70,13 @@ USAGE:
       -l                  list all available checks only (does not perform any check)
       -e                  exclude group extras
       -b                  do not print Prowler banner
+      -V                  show version number & exit
       -h                  this help
   "
   exit
 }
 
-while getopts ":hlkp:r:c:g:f:m:M:enb" OPTION; do
+while getopts ":hlkp:r:c:g:f:m:M:enbV" OPTION; do
    case $OPTION in
      h )
         usage
@@ -118,6 +119,11 @@ while getopts ":hlkp:r:c:g:f:m:M:enb" OPTION; do
      e )
         EXTRAS=1
         ;;
+     V )
+        echo "Prowler $PROWLER_VERSION"
+        EXITCODE=0
+        exit $EXITCODE
+        ;;
      : )
         echo ""
         echo "$OPTRED ERROR!$OPTNORMAL  -$OPTARG requires an argument"
@@ -250,6 +256,9 @@ show_all_titles() {
 	done
 }
 
+# Gather account data / test aws cli connectivity
+getWhoami
+
 # Execute single check if called with -c
 if [[ $CHECK_ID ]];then
   execute_check $CHECK_ID
@@ -279,7 +288,6 @@ if [[ $MODE != "csv" ]]; then
   prowlerBanner
 fi
 
-getWhoami
 genCredReport
 saveReport
 execute_all