refactor: inlining version

DeveloperC286 · Dec 29, 2021 · 7eabbee · 7eabbee
1 parent f7c7b17
commit 7eabbee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ conventional-commits-next-version-checking:
     - cargo install conventional_commits_next_version
   script:
     # Get current version.
-    - CURRENT_VERSION=$(cat zsh-simple-abbreviations.zsh | grep "_ZSH_SIMPLE_ABBREVIATIONS_VERSION" | cut -d "'" -f 2)
+    - CURRENT_VERSION=$(cat src/zsh-simple-abbreviations | grep "^VERSION" | cut -d "'" -f 2)
     # Check current version is in semantic versioning.
     - echo "${CURRENT_VERSION}" | grep "^${SEMANTIC_VERSIONING_REGEX}$"
     # Get latest tag.
@@ -60,7 +60,7 @@ version-badge-checking:
   image: alpine
   script:
     # Get current version.
-    - CURRENT_VERSION=$(cat zsh-simple-abbreviations.zsh | grep "_ZSH_SIMPLE_ABBREVIATIONS_VERSION" | cut -d "'" -f 2)
+    - CURRENT_VERSION=$(cat src/zsh-simple-abbreviations | grep "^VERSION" | cut -d "'" -f 2)
     # Check current version is in semantic versioning.
     - echo "${CURRENT_VERSION}" | grep "^${SEMANTIC_VERSIONING_REGEX}$"
     # Check README version badge and version match.
@@ -74,7 +74,7 @@ releasing:
   image: rust
   script:
     # Get current version.
-    - CURRENT_VERSION=$(cat zsh-simple-abbreviations.zsh | grep "_ZSH_SIMPLE_ABBREVIATIONS_VERSION" | cut -d "'" -f 2)
+    - CURRENT_VERSION=$(cat src/zsh-simple-abbreviations | grep "^VERSION" | cut -d "'" -f 2)
     # Check current version is in semantic versioning.
     - echo "${CURRENT_VERSION}" | grep "^${SEMANTIC_VERSIONING_REGEX}$"
     # If the tag already exist then exit.

diff --git a/src/zsh-simple-abbreviations b/src/zsh-simple-abbreviations
@@ -1,5 +1,6 @@
 #!/usr/bin/env zsh
 
+VERSION='0.2.0'
 KEY_REGEX="-_a-zA-Z0-9"
 
 __zsh_simple_abbreviations::expand() {
@@ -46,7 +47,7 @@ case $1 in
 						return
 				fi
 
-				echo "${_ZSH_SIMPLE_ABBREVIATIONS_VERSION}"
+				echo "${VERSION}"
 		;;
 		*)
 				echo "zsh_simple_abbreviations unrecognised sub-command."

diff --git a/zsh-simple-abbreviations.zsh b/zsh-simple-abbreviations.zsh
@@ -1,8 +1,6 @@
 #!/usr/bin/env zsh
 
 if [[ -n $ZSH_VERSION ]]; then
-		typeset -g _ZSH_SIMPLE_ABBREVIATIONS_VERSION='0.2.0'
-
 		# Create new abbreviations map.
 		typeset -Ag _zsh_simple_abbreviations