🐛 Fix minor bugs

- Fix double line for default theme.
- Fix "pve" command.
- Fix python virtualenv checking.

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 > Any trouble, please visit the [troubleshooting page](https://github.com/diogocavilha/fancy-git/blob/master/TROUBLESHOOTING.md)
 
+## v7.1.7
+
+- Fix double line for default theme.
+- Fix "pve" command.
+- Fix python virtualenv checking.
+
 ## v7.1.6
 
 - Fix code stye according to ShellCheck rules.

README.md

@@ -71,8 +71,7 @@ As a picture is worth a thousand words...
 ![006](https://github.com/diogocavilha/fancy-git/blob/master/images/default_006.png)
 ![007](https://github.com/diogocavilha/fancy-git/blob/master/images/default_007.png)
 
-**Working on a Python virtual environment?**
-
+Working on a Python virtual environment?
 ![python_venv](https://github.com/diogocavilha/fancy-git/blob/master/images/python_venv.png)
 
 # :art: Themes and color schemes

alias_functions/pve.sh

@@ -7,7 +7,7 @@
 
 venv_name="none"
 
-if [[ -n ${VIRTUAL_ENV} ]]; then
+if [ -n "${VIRTUAL_ENV}" ]; then
     venv_name=$(basename "$VIRTUAL_ENV")
 fi
 

theme-functions.sh

@@ -144,6 +144,18 @@ __fancygit_get_poor_notification_area() {
     echo ""
 }
 
+# ----------------------------------------------------------------------------------------------------------------------
+# Return a boolean informing if there is a conda virtualenv.
+# ----------------------------------------------------------------------------------------------------------------------
+__has_conda_env() {
+    if [ "$CONDA_DEFAULT_ENV" != "base" ] && [[ -n $CONDA_DEFAULT_ENV ]]
+    then
+        return 0
+    fi
+
+    return 1
+}
+
 # ----------------------------------------------------------------------------------------------------------------------
 # Return the icon that indicates we're working in a virtual environment.
 # ----------------------------------------------------------------------------------------------------------------------
@@ -152,7 +164,7 @@ __fancygit_get_venv_icon() {
 
     icon_venv=" "
 
-    if [[ -n $VIRTUAL_ENV ]] || [ "$CONDA_DEFAULT_ENV" != "base" ] && [[ -n $CONDA_DEFAULT_ENV ]]
+    if [[ -n $VIRTUAL_ENV ]] || __has_conda_env
     then
         echo "$icon_venv"
         return
@@ -165,13 +177,13 @@ __fancygit_get_venv_icon() {
 # Return the virtual environment name if it exists.
 # ----------------------------------------------------------------------------------------------------------------------
 fancygit_theme_get_venv_name() {
-    if [[ -n ${VIRTUAL_ENV} ]]
+    if [[ -n $VIRTUAL_ENV ]]
     then
         printf "%s" "$(basename "${VIRTUAL_ENV}")"
         return
     fi
 
-    if [ "$CONDA_DEFAULT_ENV" != "base" ] && [[ -n ${CONDA_DEFAULT_ENV} ]]
+    if __has_conda_env
     then
         printf "%s" "$(basename "${CONDA_DEFAULT_ENV}")"
         return
@@ -219,7 +231,7 @@ fancygit_theme_get_time() {
 fancygit_theme_get_double_line() {
     if fancygit_config_is "double_line" "true"
     then
-        printf "\n%s" "\n$(fancygit_config_get "ps2" "➜")"
+        printf "\n%s" "$(fancygit_config_get "ps2" "➜")"
     fi
 
     echo ""

version.sh

@@ -3,4 +3,4 @@
 # Author: Diogo Alexsander Cavilha <[email protected]>
 # Date:   11.17.2017
 
-export FANCYGIT_VERSION="7.1.6"
+export FANCYGIT_VERSION="7.1.7"