git-rev-label 2.19.16 → 2.23.20

package/git-rev-label

@@ -21,8 +21,8 @@ shopt -s inherit_errexit
 shopt -s lastpipe
 shopt -s expand_aliases
 
-VERSION=master-c19-g708fa40-b16
-VERSION_NPM=2.19.16
+VERSION=master-c23-g85b7fdc-b20
+VERSION_NPM=2.23.20
 
 ## todo maybe use utils.bash from autorsync
 function echomsg      { echo $'\e[1;37m'"$@"$'\e[0m'; }
@@ -168,6 +168,7 @@ while (( $# > 0 )) ;do
          -v()    { --variables "$@"; }
          --vars(){ --variables "$@"; }
          ;;
+      # --format)         ##todo parse next argument as set_with_warn format "$1" via set_next_with_warn format
       --format=*)       set_with_warn format "${1##--format=}";;
       --format-file=*)  set_with_warn format "$(cat "${1##--format-file=}")";;
       --format-from=*)  set_with_warn format "$(cat "${1##--format-from=}")";;
@@ -312,9 +313,12 @@ requested_variables_to_be_evaluated(){
    ## Calculate only requested variables: parse $format, detect required vars, then calculate required variables.
    requested_variables=$(echo "$format"| perl -ne '$var="[A-Za-z_][A-Za-z0-9_]+"; print "$1$2 " while m,\$(?:($var)|\{($var)\}),g')
 echodbg requested_variables="$requested_variables"
-   if test -z "$requested_variables"
-   then return ;fi
-   needed_variables=$(grep -Fx -f <(echo "$requested_variables"|resolve_dependancies|space_newline)  <(echo $FULL_LIST|space_newline))
+   test -n "$requested_variables" || return
+   # shellcheck disable=SC2086  ## shellcheck cannot track variables usage because they are referenced individually
+   needed_variables=$(
+      grep -Fx -f <(echo "$requested_variables"|resolve_dependancies|space_newline) \
+      <(echo $FULL_LIST|space_newline)
+      )
 echodbg needed_variables="$needed_variables"
    func_variables_body="$(get_function_body variables)"
    for varname in $needed_variables ;do
@@ -339,7 +343,9 @@ variables_always_calculated
 ########################################################
 ########## Handle non-maintenance actions ##############
 default_action(){
-   eval $(requested_variables_to_be_evaluated)
+   # shellcheck disable=SC2046  ## The quotes would unquote this, we need unquoted expansion
+   # shellcheck disable=SC2086  ## Word splitting is intentional in this case
+   eval "$(requested_variables_to_be_evaluated)"
    echo "$format" | expand_env_vars
 }
 if ! is_sourced ;then

package/package.json

@@ -1,28 +1,28 @@
 {
-   "name": "git-rev-label",
-   "description": "Obtain information about Git repository revision in format like 'master-c73-gbbb6bec'",
-   "version":"2.19.16",
-   "homepage": "https://gitlab.com/kyb/git-rev-label",
-   "keywords": [
-     "git",
-     "rev",
-     "revision",
-     "versioning"
-   ],
-   "author": {
-      "name": "Ivan Kuvaldin",
-      "url": "https://gitlab.com/kyb"
-   },
-   "repository": {
-     "type": "git",
-     "url": "https://gitlab.com/kyb/git-rev-label"
-   },
-   "main": "./git-rev-label",
-   "bin": {
-      "git-rev-label": "./git-rev-label"
-   },
-   "scripts": {
-      "build":"./BUILD"
-   },
-   "license": "MIT"
+  "name": "git-rev-label",
+  "description": "Obtain information about Git repository revision in format like 'master-c73-gbbb6bec'",
+  "version":"2.23.20",
+  "homepage": "https://gitlab.com/kyb/git-rev-label",
+  "keywords": [
+    "git",
+    "rev",
+    "revision",
+    "versioning"
+  ],
+  "author": {
+    "name": "Ivan Kuvaldin",
+    "url": "https://gitlab.com/kyb"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitlab.com/kyb/git-rev-label"
+  },
+  "main": "./git-rev-label",
+  "bin": {
+    "git-rev-label": "./git-rev-label"
+  },
+  "scripts": {
+    "build": "./BUILD"
+  },
+  "license": "MIT"
 }