Support AWS_PROFILE for AWS integration

Author: fernandocarletti

functions/fish_prompt.fish

@@ -656,45 +656,34 @@ end
 # ==============================
 
 function __bobthefish_prompt_aws_profile -S -d 'Show AWS profile'
-    [ "$theme_display_aws_profile" = 'yes' ]
+    [ "$theme_display_aws_profile" = 'yes' -o "$theme_display_aws_vault_profile" = 'yes' ]
     or return
 
-    [ -n "$AWS_PROFILE" ]
-    or return
-
-    set -l profile $AWS_PROFILE
-    set -l segment $profile
-
-    __bobthefish_start_segment $color_aws
-    echo -ns $segment ' '
-end
-
-function __bobthefish_prompt_aws_vault_profile -S -d 'Show AWS Vault profile'
-    [ "$theme_display_aws_vault_profile" = 'yes' ]
-    or return
-
-    [ -n "$AWS_VAULT" -a -n "$AWS_SESSION_EXPIRATION" ]
-    or return
+    if set -q "AWS_PROFILE"
+        __bobthefish_start_segment $color_aws
+        echo -ns $AWS_PROFILE ' '
+    end
 
-    set -l profile $AWS_VAULT
+    if set -q "AWS_VAULT"
+        set -l now (date --utc +%s)
+        set -l expiry (date -d "$AWS_SESSION_EXPIRATION" +%s)
+        set -l diff_mins (math "floor(( $expiry - $now ) / 60)")
 
-    set -l now (date --utc +%s)
-    set -l expiry (date -d "$AWS_SESSION_EXPIRATION" +%s)
-    set -l diff_mins (math "floor(( $expiry - $now ) / 60)")
+        set -l diff_time $diff_mins"m"
+        [ $diff_mins -le 0 ]
+        and set -l diff_time '0m'
+        [ $diff_mins -ge 60 ]
+        and set -l diff_time (math "floor($diff_mins / 60)")"h"(math "$diff_mins % 60")"m"
 
-    set -l diff_time $diff_mins"m"
-    [ $diff_mins -le 0 ]
-    and set -l diff_time '0m'
-    [ $diff_mins -ge 60 ]
-    and set -l diff_time (math "floor($diff_mins / 60)")"h"(math "$diff_mins % 60")"m"
+        set -l segment $profile ' (' $diff_time ')'
+        set -l status_color $color_aws
+        [ $diff_mins -le 0 ]
+        and set -l status_color $color_aws_vault_expired
 
-    set -l segment $profile ' (' $diff_time ')'
-    set -l status_color $color_aws
-    [ $diff_mins -le 0 ]
-    and set -l status_color $color_aws_vault_expired
 
-    __bobthefish_start_segment $status_color
-    echo -ns $segment ' '
+        __bobthefish_start_segment $color_aws
+        echo -ns $AWS_VAULT ' '
+    end
 end
 
 
@@ -1149,7 +1138,6 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
 
     # Cloud Tools
     __bobthefish_prompt_aws_profile
-    __bobthefish_prompt_aws_vault_profile
 
     # Virtual environments
     __bobthefish_prompt_nix