epm repack common.sh: add get_json_value and use it

repack.d/android-studio.sh

@@ -17,13 +17,6 @@ orig="studio"
 # use native launcher as recommended
 add_bin_link_command $PRODUCT $PRODUCTDIR/bin/$orig
 
-# file fieldstring
-get_json_value()
-{
-    [ -s "$1" ] || fatal "Missed $1 file"
-    epm tool json -b < "$1" | grep -m1 -F "$2" | sed -e 's|.*[[:space:]]||' | sed -e 's|"||g'
-}
-
 wmClass="$(get_json_value .$PRODUCTDIR/product-info.json '["launch",0,"startupWmClass"]')"
 [ -n "$wmClass" ] || wmClass="$PRODUCT"
 

repack.d/common.sh

@@ -82,6 +82,26 @@ is_url()
     echo "$1" | grep -q "^[filehtps]*:/"
 }
 
+# ["version"]
+parse_json_value()
+{
+    local field="$1"
+    echo "$field" | grep -q -E "^\[" || field='["'$field'"]'
+    epm tool json -b | grep -m1 -F "$field" | sed -e 's|.*[[:space:]]||' | sed -e 's|"\(.*\)"|\1|g'
+}
+
+# URL/file ["version"]
+get_json_value()
+{
+    if is_url "$1" ; then
+        eget -q -O- "$1" | parse_json_value "$2"
+    else
+        [ -s "$1" ] || fatal "File $1 is missed, can't get json"
+        parse_json_value "$2" < "$1"
+    fi
+}
+
+
 estrlist()
 {
     epm tool estrlist "$@"

repack.d/gigaideCE.sh

@@ -15,13 +15,6 @@ move_to_opt "/gigaide-CE-*"
 # use native launcher as recommended
 add_bin_link_command $PRODUCT $PRODUCTDIR/bin/idea
 
-# file fieldstring
-get_json_value()
-{
-    [ -s "$1" ] || fatal "Missed $1 file"
-    epm tool json -b < "$1" | grep -m1 -F "$2" | sed -e 's|.*[[:space:]]||' | sed -e 's|"||g'
-}
-
 wmClass="$(get_json_value .$PRODUCTDIR/product-info.json '["launch",0,"startupWmClass"]')"
 [ -n "$wmClass" ] || wmClass="$PRODUCT"