Skip to content

Commit 7a4ae8d

Browse files
committed
Fixed issue that made the script fail after new pkgs.alpinelinux.org
Bumped version to 0.07
1 parent 841dedb commit 7a4ae8d

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/docker-hub.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jobs:
2222
with:
2323
context: .
2424
push: true
25-
tags: fcolista/apkfile:v0.06
25+
tags: fcolista/apkfile:v0.07

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = apkfile
2-
VERSION = 0.06
2+
VERSION = 0.07
33

44
PREFIX?=/usr
55
DESTDIR?=$(PREFIX)/bin

apkfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
_ver=0.06
2+
_ver=0.07
33
_apiurl="https://pkgs.alpinelinux.org"
44

55
pattern=$1
@@ -22,7 +22,7 @@ check() {
2222
webcheck() {
2323
local _tmp=$(mktemp)
2424
curl -q -s $_apiurl/packages>$_tmp
25-
local alpine_versions=$(cat $_tmp | html2text | grep -A1 Branch| tr -d '\n' | tr -d ']' | cut -d\/ -f2- | tr '\/' ' ')
25+
local alpine_versions=$(cat $_tmp | html2text | grep -A1 Branch|head -1| tr -d '\n' | tr -d ']' | cut -d\/ -f2- | tr '\/' ' ')
2626
local alpine_arches=$(cat $_tmp | html2text | grep x86 | cut -d\/ -f2-| tr -d ']'| tr '\/' ' ')
2727
echo -e "\n$_apiurl/packages supports the following alpine versions and architectures:"
2828
echo -e "\t=> Versions: $(echo $alpine_versions) all"
@@ -51,7 +51,7 @@ usage() {
5151
}
5252

5353
query() {
54-
curl -s -d"$1" -H "application/x-www-form-urlencoded" -X GET $_apiurl/contents | sed "s///\//g" | html2text -nobs -to_encoding ASCII | sed /^$/d | sed '1d' | awk /^File/,/Copy/ |grep -vE 'Privacy|Policy'
54+
curl --http2 -s -X GET "$_apiurl/contents?$1" | sed "s///\//g" | html2text -nobs -to_encoding ASCII | sed /^$/d | sed '1d' | awk /^File/,/Copy/ |grep -vE 'Privacy|Policy' | grep -v '*'
5555
}
5656

5757
check && if ! [ $pattern ] ; then usage; fi
@@ -72,13 +72,13 @@ echo $valid_branch | grep -qi $branch || ( echo "Invalid branch. Valid values ar
7272
if [ $branch == "all" ]; then
7373
if [ $arch == "all" ]; then
7474
for b in $valid_branch; do
75-
query "branch=$b&file=$pattern"
75+
query "file=$pattern&branch=$b"
7676
done
7777
else
7878
for b in $valid_branch; do
79-
query "branch=$b&file=$pattern&arch=$arch"
79+
query "file=$pattern&branch=$b&arch=$arch"
8080
done
8181
fi
8282
else
83-
query "branch=$branch&file=$pattern&arch=$arch"
83+
query "file=$pattern&branch=$branch&arch=$arch"
8484
fi

0 commit comments

Comments
 (0)