arm64: move tools.func changes from VE to VED
This commit is contained in:
@@ -2735,10 +2735,13 @@ function fetch_and_deploy_codeberg_release() {
|
|||||||
# Fall back to architecture heuristic
|
# Fall back to architecture heuristic
|
||||||
if [[ -z "$url_match" ]]; then
|
if [[ -z "$url_match" ]]; then
|
||||||
for u in $assets; do
|
for u in $assets; do
|
||||||
if [[ "$u" =~ ($arch|amd64|x86_64|aarch64|arm64).*\.deb$ ]]; then
|
if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
|
||||||
url_match="$u"
|
[[ "$u" =~ (amd64|x86_64).*\.deb$ ]] || continue
|
||||||
break
|
elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
|
||||||
|
[[ "$u" =~ (arm64|aarch64).*\.deb$ ]] || continue
|
||||||
fi
|
fi
|
||||||
|
url_match="$u"
|
||||||
|
break
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -3035,7 +3038,11 @@ _gh_scan_older_releases() {
|
|||||||
done)
|
done)
|
||||||
fi
|
fi
|
||||||
if [[ "$has_match" != "true" ]]; then
|
if [[ "$has_match" != "true" ]]; then
|
||||||
has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE "($arch|amd64|x86_64|aarch64|arm64).*\.deb$" && echo true)
|
if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
|
||||||
|
has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE '(amd64|x86_64).*\.deb$' && echo true)
|
||||||
|
elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
|
||||||
|
has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE '(arm64|aarch64).*\.deb$' && echo true)
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ "$has_match" != "true" ]]; then
|
if [[ "$has_match" != "true" ]]; then
|
||||||
has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE '\.deb$' && echo true)
|
has_match=$(echo "$releases_list" | jq -r ".[$i].assets[].browser_download_url" | grep -qE '\.deb$' && echo true)
|
||||||
@@ -3233,10 +3240,13 @@ function fetch_and_deploy_gh_release() {
|
|||||||
# If no match via explicit pattern, fall back to architecture heuristic
|
# If no match via explicit pattern, fall back to architecture heuristic
|
||||||
if [[ -z "$url_match" ]]; then
|
if [[ -z "$url_match" ]]; then
|
||||||
for u in $assets; do
|
for u in $assets; do
|
||||||
if [[ "$u" =~ ($arch|amd64|x86_64|aarch64|arm64).*\.deb$ ]]; then
|
if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
|
||||||
url_match="$u"
|
[[ "$u" =~ (amd64|x86_64).*\.deb$ ]] || continue
|
||||||
break
|
elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
|
||||||
|
[[ "$u" =~ (arm64|aarch64).*\.deb$ ]] || continue
|
||||||
fi
|
fi
|
||||||
|
url_match="$u"
|
||||||
|
break
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -3267,10 +3277,13 @@ function fetch_and_deploy_gh_release() {
|
|||||||
fi
|
fi
|
||||||
if [[ -z "$url_match" ]]; then
|
if [[ -z "$url_match" ]]; then
|
||||||
for u in $assets; do
|
for u in $assets; do
|
||||||
if [[ "$u" =~ ($arch|aarch64|arm64).*\.deb$ ]]; then
|
if [[ "${arch,,}" =~ ^(amd64|x86_64)$ ]]; then
|
||||||
url_match="$u"
|
[[ "$u" =~ (amd64|x86_64).*\.deb$ ]] || continue
|
||||||
break
|
elif [[ "${arch,,}" =~ ^(arm64|aarch64)$ ]]; then
|
||||||
|
[[ "$u" =~ (arm64|aarch64).*\.deb$ ]] || continue
|
||||||
fi
|
fi
|
||||||
|
url_match="$u"
|
||||||
|
break
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
if [[ -z "$url_match" ]]; then
|
if [[ -z "$url_match" ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user