Fix theme simple and minor fix in theme special.

Too fix variable ${RESET} in git, now save as %b

4 files changed, 11 insertions, 10 deletions

diff --git a/hyperterm/core/git.sh b/hyperterm/core/git.sh
index c6a4dcf..accb1e3 100644
--- a/hyperterm/core/git.sh
+++ b/hyperterm/core/git.sh
@@ -6,7 +6,7 @@ function _symbols() {
     # Import colors
     _colors_bash "$@"
 
-    __ps="$(printf '%b\u7C%s' "${BOLD}${LEMON}" "${RESET}")" # |
+    __ps="$(printf '%b\u7C%b' "${BOLD}${LEMON}" "${RESET}")" # |
     __ss="$(printf '%b\u2714' "${BOLD}${CYAN}")" # ✔
     __dss="$(printf '%b\u002A' "${BOLD}${RED}")" # ∗
     __ahs="$(printf '%b\u2191' "${BOLD}${CYAN}")" # ↑
diff --git a/hyperterm/hyperterm.sha512 b/hyperterm/hyperterm.sha512
index 4f7b3e1..6a7fcc5 100644
--- a/hyperterm/hyperterm.sha512
+++ b/hyperterm/hyperterm.sha512
@@ -13,15 +13,15 @@ fab9d339a99c7d2e1809d1c44f533523c6bfcdcc8d63c62b335ce7d4c666c8bdd7ac319316bf71f0
 feff7e1dc5d3a84761495979eaf091dc2132fa081c3b4501756973a25e0514e9a00cc9a201767bac7d391eaee631777bbbd9bc032110e99da099c33f710a4c9f ./tools/network.sh
 7447d3e167ab207d3ef4218e201a06bf5a3fc23281639f16f7f405f1d66b73923845d450fdb0a94672757866a9da0324f728564a1b61b2ed1678fe576eb565cf ./core/autocomplete.sh
 065cfa39f1b4312ed275ad1039827a24f703176c653a8d27303d145f9d389a60ec5b3a9eb167e060cc6fd093b9c03cfb1a8b70254d444fbc6e62e2297d88b310 ./core/status.sh
-dcc5b2ff2c6e4c4bf77a1ef9c81e9987dc14bc8a15d38f6b3bc2459f26ef1e71b0febf5c1adbf4e5410ac357043f293a98d4f8001cb21a049081cedd46b64b20 ./core/git.sh
+3cdfedebc1b15c342c0dabde7501fac4a7c2ac13f31cd84792d8d7f407659535e3baf6472c039ea542dc573d7a88811df58f34f2cd1bbd1de3f35434122314cf ./core/git.sh
 915196c638ac432a0eccb4cd127af14398385cb7094b3f6142adc21e4c4f155214ead74511f21b6acf20d2edad8934e893a8900ceafc59df8e66bc789095d58c ./core/update.sh
 f3e00b2aa8ab9f3ab44570adaa2520408ed66fd00f551654d60b64a4be3546ec781b7efa39bcd774937e654b6ffb4c7af3f21eeb36caf9c01f82f85cf28e2b4d ./core/languages.sh
 1cfba599047d84a17ff92b695ebf527a505a30acc9ec21a2b9f410a7ea6dde4b23b5cf62e557d82f2fe9a8980649942424b879ca53baae4d4cb3057681baa7b6 ./core/colors.sh
 ab3089453e35cc38544dffe672d532cbd559634937893a053937b599175688aecc5f3caad3064e818b883b027f27713194e3909dc3ab0246922cea00557c595a ./hyperterm.sh
 1d70b22277aa1d37e770f952411687c30d47da8caae278e431208671af239591d259258b4982ca9b61faf57f266958a002180496b0db036a94250604212aa1bb ./themes/pure.sh
-97852d009fb8450896708ae53b0fecc6d4ef8c6a7992ff4ba7c95c2b93bac7084fcf2cc1a8de88e93ef8bba9ab5e26f9aa0eb44bcdfb9148e417997852aafdb9 ./themes/special.sh
+7efe3770a629d6168b1c9007f420d2d657fa38fc1673dd5dc365dcf3c9d4c34456e346f9ed739c347133f93ad78cf88d0d54fe95523ce5d91a51cd49650d7525 ./themes/special.sh
 c6c149704883ce5cbbd941019259effb105dd6910c98910782024311b3362df2e68d03c947908d40686c2620c1521aeee2ffb019a906ad367be1cc3d429ecd82 ./themes/minterm.sh
-6d8d184dca8bd1108aad73b47732dcf41c27dc4757c9747b3973f98759b8ec7d2181dfd58fad278688f141a0e78b8bb8c8bfc311c6e5f591c735b0a6dbe575e3 ./themes/simple.sh
+e5f07398293342211786c3de1e04d0eb50db297b415bd1e659e57af92751f934bd2d747bbc19d41b5519f33cc16b1c908df754e6340a3b68cc7cb2fc33585181 ./themes/simple.sh
 07bb7b6bd609e855d0a7c9e39a0ff2959851f559106e8f59816312f298b03e87f39e53430869ed61a1271e265e976ea6b56f7ccee46c4ec3c37b40f1fc11cfad ./themes/default.sh
 403fe028575baa22c39dd11ac56a246369b8e38524c216f6d564b59aa22c60a426941f755ad3adb75f212c9124350ce3aeb114ba365ded1ed33b62ac480a60aa ./themes/light_theme.sh
 074e8549d638dee7470583c04ebbb7408181974806bd5e2cf5fc134ddee83c01040ed9d59a8aa00a87287b25df1c2e23edf3c063426952a8aeb56db8310ef8fd ./themes/joy.sh
diff --git a/hyperterm/themes/simple.sh b/hyperterm/themes/simple.sh
index d2f2129..b111f32 100644
--- a/hyperterm/themes/simple.sh
+++ b/hyperterm/themes/simple.sh
@@ -6,16 +6,17 @@ unset simple
 _colors_bash "$@"
 
 __time_out_command() {
-    cut -d\  -f1 /proc/loadavg
+    awk '{ print $1 }' /proc/loadavg
 }
 
 : "${simple:=\n\
 \[${RESET}\]\
 \[${BOLD}${GREY}\]\
-\$(__time_out_command) \
-\$(exitstatus)\
-\$(__prompt_git)\
-\[${BOLD}${GREEN}\] $SYMBOL \[$RESET\]}"
+\$(exitstatus)\[$RESET\] \
+\[${BOLD}${GREY}\]\
+\$(__time_out_command)\[$RESET\]\
+\$(__prompt_git)\n\
+\[${BOLD}${GREEN}\]$SYMBOL \[$RESET\]}"
 
 unset _psi
 : "${_psi:=\[${BOLD}${CYAN}\]=>\[$RESET\] }"
diff --git a/hyperterm/themes/special.sh b/hyperterm/themes/special.sh
index 08b2f87..fd58b1e 100644
--- a/hyperterm/themes/special.sh
+++ b/hyperterm/themes/special.sh
@@ -25,7 +25,7 @@ special=("\n\
 \[${BOLD}${CYAN}\]hist:\!\[$RESET\]\n\
 \[${BOLD}${GREY}\]\
 \D{%Y-%m-%d}@\D{%I:%M%p}\[$RESET\] \
-\$(exitstatus)\[$_PROMPT_RESET\]\
+\$(exitstatus)\[$RESET\]\
 \$(__prompt_git)\n\
 \[${BOLD}${GREEN}\]$SYMBOL \[$RESET\]")