commit packed 3.64.24

packed/epm.sh

@@ -34,7 +34,7 @@ SHAREDIR="$PROGDIR"
 # will replaced with /etc/eepm during install
 CONFIGDIR="$PROGDIR/../etc"
 
-export EPMVERSION="3.64.23"
+export EPMVERSION="3.64.24"
 
 # package, single (file), pipe, git
 EPMMODE="package"
@@ -277,8 +277,7 @@ is_dirpath()
 is_wildcard()
 {
     echo "$1" | grep -q "[*?]" && return
-    echo "$1" | grep -q "\]" && return
-    echo "$1" | grep -q "\[" && return
+    echo "$1" | grep -q "\[.*\]" && return
 }
 
 filter_strip_spaces()
@@ -3580,6 +3579,8 @@ __check_if_wildcard_downloading()
 {
     mask="$(basename "$1")"
     is_wildcard "$mask" || return 1
+    # skip ? as param
+    echo "$mask" | grep -E -q '\?.*=' && return 1
 
     local fn
     fn="$(docmd eget --list "$url" | xargs -n1 basename 2>/dev/null)"
@@ -15873,7 +15874,8 @@ echo "$DIST_ARCH"
 
 get_debian_arch()
 {
-    local arch="$(get_arch)"
+    local arch="$1"
+    [ -n "$arch" ] || arch="$(get_arch)"
     case $arch in
     'x86')
         arch='i386' ;;
@@ -15881,6 +15883,20 @@ get_debian_arch()
         arch='amd64' ;;
     'aarch64')
         arch='arm64' ;;
+    'armhf')
+        arch='armv7l' ;;
+    esac
+    echo "$arch"
+}
+
+get_arch_arch()
+{
+    local arch
+    local arch="$1"
+    [ -n "$arch" ] || arch="$(get_arch)"
+    case $arch in
+        'x86_64')
+            arch='x64' ;;
     esac
     echo "$arch"
 }
@@ -15900,6 +15916,12 @@ get_distro_arch()
             return
             ;;
     esac
+    case "$(pkgmanager)" in
+        pacman)
+            get_arch_arch
+            return
+            ;;
+    esac
     echo "$arch"
 }
 
@@ -16119,7 +16141,7 @@ print_help()
     echo "Usage: distro_info [options] [SystemName/Version]"
     echo "Options:"
     echo " -h | --help            - this help"
-    echo " -a                     - print hardware architecture (use --distro-arch for distro depended arch name)"
+    echo " -a                     - print hardware architecture (use --distro-arch for distro depended arch name or --debian-arch for Debian style)"
     echo " -b                     - print size of arch bit (32/64)"
     echo " -c                     - print number of CPU cores"
     echo " -i                     - print virtualization type"
@@ -16227,6 +16249,9 @@ case "$1" in
     --debian-arch)
         get_debian_arch
         ;;
+    --arch-arch)
+        get_arch_arch
+        ;;
     --glibc-version)
         get_glibc_version
         ;;

packed/serv.sh

@@ -34,7 +34,7 @@ SHAREDIR=$PROGDIR
 # will replaced with /etc/eepm during install
 CONFIGDIR=$PROGDIR/../etc
 
-EPMVERSION="3.64.23"
+EPMVERSION="3.64.24"
 
 # package, single (file), pipe, git
 EPMMODE="package"
@@ -274,8 +274,7 @@ is_dirpath()
 is_wildcard()
 {
     echo "$1" | grep -q "[*?]" && return
-    echo "$1" | grep -q "\]" && return
-    echo "$1" | grep -q "\[" && return
+    echo "$1" | grep -q "\[.*\]" && return
 }
 
 filter_strip_spaces()
@@ -2600,7 +2599,8 @@ echo "$DIST_ARCH"
 
 get_debian_arch()
 {
-    local arch="$(get_arch)"
+    local arch="$1"
+    [ -n "$arch" ] || arch="$(get_arch)"
     case $arch in
     'x86')
         arch='i386' ;;
@@ -2608,6 +2608,20 @@ get_debian_arch()
         arch='amd64' ;;
     'aarch64')
         arch='arm64' ;;
+    'armhf')
+        arch='armv7l' ;;
+    esac
+    echo "$arch"
+}
+
+get_arch_arch()
+{
+    local arch
+    local arch="$1"
+    [ -n "$arch" ] || arch="$(get_arch)"
+    case $arch in
+        'x86_64')
+            arch='x64' ;;
     esac
     echo "$arch"
 }
@@ -2627,6 +2641,12 @@ get_distro_arch()
             return
             ;;
     esac
+    case "$(pkgmanager)" in
+        pacman)
+            get_arch_arch
+            return
+            ;;
+    esac
     echo "$arch"
 }
 
@@ -2846,7 +2866,7 @@ print_help()
     echo "Usage: distro_info [options] [SystemName/Version]"
     echo "Options:"
     echo " -h | --help            - this help"
-    echo " -a                     - print hardware architecture (use --distro-arch for distro depended arch name)"
+    echo " -a                     - print hardware architecture (use --distro-arch for distro depended arch name or --debian-arch for Debian style)"
     echo " -b                     - print size of arch bit (32/64)"
     echo " -c                     - print number of CPU cores"
     echo " -i                     - print virtualization type"
@@ -2954,6 +2974,9 @@ case "$1" in
     --debian-arch)
         get_debian_arch
         ;;
+    --arch-arch)
+        get_arch_arch
+        ;;
     --glibc-version)
         get_glibc_version
         ;;