Added into {array variable name} for json get api.

gwoo · Dec 13, 2011 · 528e90e · 528e90e
1 parent 091941f
commit 528e90e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/core/internal/shell/json/functions b/core/internal/shell/json/functions
@@ -2,7 +2,7 @@
 
 __sm.json.get()
 {
-  typeset _type _path _default _variable _json_file
+  typeset _type _path _default _variable _json_file _array_name
   _json_file="$1" && shift
 
   # TODO: support 'as {variable name}'
@@ -13,6 +13,11 @@ __sm.json.get()
     _type="$1" && shift
     _path="$1" && shift
     case "${_type}" in
+      (into)
+        _array_name="${_path}"
+        typeset -ga ${_array_name}
+
+        ;;
       (string)
         while :
         do
@@ -44,6 +49,11 @@ __sm.json.get()
         then
           eval "${_variable}=\"${_default}\""
         fi
+
+        if [[ -n "${_array_name}" ]]
+        then
+          eval "${_array_name}+=(${_variable} \${${_variable}})"
+        fi
         ;;
       (array)
         while :
@@ -76,6 +86,11 @@ __sm.json.get()
         then
           eval "${_variable}=(${_default})"
         fi
+
+        if [[ -n "${_array_name}" ]]
+        then
+          eval "${_array_name}+=(${_variable} \${${_variable}})"
+        fi
         ;;
     esac
   done

diff --git a/core/internal/shell/vcs/detection/functions b/core/internal/shell/vcs/detection/functions
@@ -95,10 +95,10 @@ is_archive_uri()
   _uri="${1:-}"
   (( $# )) && shift || fail "uri must be given as first parameter."
   case "${_uri}" in
-    *.tar*|*.tgz*|*.txz*|*.tbz2*|*.xz*|*.bz2*|*.gz*|*.zip*|*.lzma*|*github.com/*/*ball/*)
+    (*.tar*|*.tgz*|*.txz*|*.tbz2*|*.xz*|*.bz2*|*.gz*|*.zip*|*.lzma*|*github.com/*/*ball/*)
       return 0
       ;;
-    *)
+    (*)
       return 1
       ;;
   esac

diff --git a/core/internal/shell/vcs/functions b/core/internal/shell/vcs/functions
@@ -37,8 +37,7 @@ fetch_uri()
 
   if [[ -z "${scm_type}" ]]
   then
-    if ! fetch_uri_detect_scm_type "${_uri}" \
-    || [[ -n "${__vcs_failed}" ]]
+    if ! fetch_uri_detect_scm_type "${_uri}" || [[ -n "${__vcs_failed}" ]]
     then
       fetch_error unknown_scm "uri=${_uri}"
       return $?