bin/czkrates

@@ -33,15 +33,12 @@ usage() {
 
 type_of() {
     #
-    # Print 'int' if $1 is an integer, 'nil' if empty; 'str' otherwise
+    # Print 'num' if $1 is a number (float or integer), 'nil' if empty; 'str' otherwise
     #
-    local es_p es_n
     test -z "$1" && echo nil && return
-    test "$1" -ge 0 2>/dev/null; es_p=$?    # assuming positive
-    test "$1" -lt 0 2>/dev/null; es_n=$?    # assuming negative
-    test $es_p -eq 2 && echo str && return
-    test $es_n -eq 2 && echo str && return
-    echo int
+    grep -qxEe '-?[0-9]*[.][0-9]+' <<<"$1" && echo num && return
+    grep -qxEe '-?[0-9]+' <<<"$1"          && echo num && return
+    echo str
 }
 
 parse_rate1() {
@@ -103,7 +100,6 @@ main() {
     local Mult
     local Date=now
     Uri=$CZKRATES_URL
-    Uri+="?date=$(date +%d.%m.%Y)"
     #shellcheck disable=SC2034
     while true; do case "$1" in
         -D|--date)    Date=$2;  shift 2 || usage ;;
@@ -114,11 +110,11 @@ main() {
     esac done
     Uri+="?date=$(date -d "$Date" +%d.%m.%Y)"
     case "$(type_of "$1"):$(type_of "$2")" in
-        int:int|str:str)    usage ;;
-        int:nil|nil:int)    Mult="$1$2"          ;;
+        num:num|str:str)    usage ;;
+        num:nil|nil:num)    Mult="$1$2"          ;;
         str:nil|nil:str)    Curr="$1$2"          ;;
-        str:int)            Curr="$1"; Mult="$2" ;;
-        int:str)            Curr="$2"; Mult="$1" ;;
+        str:num)            Curr="$1"; Mult="$2" ;;
+        num:str)            Curr="$2"; Mult="$1" ;;
     esac
     Curr="${Curr:-$CZKRATES_DEFAULT_CURRENCY}"
     Curr="${Curr^^}"

bin/mdvimb

@@ -140,7 +140,7 @@ main() {
     MdFile=$1; shift
     debug -v MDVIMB__CONVERTER MDVIMB__CONFIG_HOME MDVIMB__STYLE
     debug -v MdFile converter NoOpen Wrap Style ConfigHome
-    converterpath=$(which "$converter") \
+    converterpath=$(command -v "$converter") \
      || die "converter not available: $converter"
     debug -v converterpath
     think "using converter: $converter"