feat: cleanup and fix version output (#138)

zap-zsh · May 3, 2023 · aa6c5d7 · aa6c5d7
1 parent 95ab1d4
commit aa6c5d7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/zap.zsh b/zap.zsh
@@ -129,8 +129,10 @@ COMMANDS:
 
 function _zap_version() {
     local -Ar color=(BLUE "\033[1;34m" GREEN "\033[1;32m" RESET "\033[0m")
-    local _ver=${$(git -C $ZAP_DIR describe --tags HEAD)%%-*} _branch=$(git -C "$ZAP_DIR" branch --show-current) _commit=${$(git -C $ZAP_DIR describe --tags HEAD)##*-}
-    echo "⚡ Zap v${color[GREEN]}${_ver}${color[RESET]}\nBranch:\t${color[GREEN]}${_branch}${color[RESET]}\nCommit:\t${color[BLUE]}${_commit#g}${color[RESET]}"
+    local _branch=$(git -C "$ZAP_DIR" branch --show-current)
+    local _hash=$(git -C "$ZAP_DIR" log -1 --pretty="%h")
+    local _date=$(git -C "$ZAP_DIR" log -1 --pretty="%cs")
+    echo "⚡ Zap - Version\n\nBranch: ${color[GREEN]}${_branch}${color[RESET]}\nCommit Hash: ${color[BLUE]}${_hash#g}${color[RESET]}\nCommit Date: ${color[BLUE]}${_date#g}${color[RESET]}"
 }
 
 function zap() {