Merge branch 'hotfix/1.3.2'

chrisnharvey · May 25, 2020 · 70441a2 · 70441a2
2 parents d7cb07f + 23ac249
commit 70441a2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 ## [Unreleased](https://github.com/chrisnharvey/magicLAMP/compare/master...develop)
 
+## v1.3.2
+
+### Fixed
+
+- Replace Emoji git statuses with ASCII equivalents for compatibility with terminals that don't support Emoji ([c7ea84b](https://github.com/chrisnharvey/magicLAMP/commit/c7ea84be2785ca3821c36199381df325af99aea3))
+
+## v1.3.1
+
+### Fixed
+
+- Path to magicLAMP update script has been fixed ([2f7daaf](https://github.com/chrisnharvey/magicLAMP/commit/2f7daaf6bfbd529e5830ec0603f24431e5b0d0a1))
+
+## v1.2.0
+
 ## v1.3.0
 
 ### New

diff --git a/containers/workspace/magicLAMP.sh b/containers/workspace/magicLAMP.sh
@@ -65,9 +65,10 @@ MINIMA_PHP_PREFIX=""
 MINIMA_NODE_SYMBOL="Node "
 MINIMA_NODE_PREFIX=""
 MINIMA_GIT_BRANCH_SYMBOL=""
-MINIMA_GIT_STATUS_DELETED="x"
-MINIMA_GIT_STATUS_AHEAD=">"
-MINIMA_GIT_STATUS_BEHIND="<"
+MINIMA_GIT_STATUS_SYMBOL_RENAMED="&"
+MINIMA_GIT_STATUS_SYMBOL_DELETED="x"
+MINIMA_GIT_STATUS_SYMBOL_AHEAD=">"
+MINIMA_GIT_STATUS_SYMBOL_BEHIND="<"
 MINIMA_CHAR_SYMBOL="$"
 MINIMA_DIR_PREFIX=""
 MINIMA_DIR_COLOR="yellow"