diff --git a/openbsd.app.pl b/openbsd.app.pl index d1af9db..c872e7e 100755 --- a/openbsd.app.pl +++ b/openbsd.app.pl @@ -62,6 +62,7 @@ my $query = q{ FULLPKGPATH, COMMENT, DESCRIPTION, + HOMEPAGE, highlight(%s, 2, '**', '**') AS COMMENT_MATCH, highlight(%s, 3, '**', '**') AS DESCR_MATCH FROM %s @@ -282,7 +283,7 @@ __DATA__ Package Name - Path + Details Comment Description @@ -291,10 +292,36 @@ __DATA__ <%= $result->{FULLPKGNAME} %> - <%= $result->{FULLPKGPATH} %> + <%== $result->{COMMENT_MATCH} %> <%== $result->{DESCR_MATCH} %> diff --git a/upgrade.sh b/upgrade.sh index b223494..9a89736 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -1,17 +1,20 @@ #!/usr/bin/env sh -set -e +set -xe mkdir -p /tmp/openbsd_app/{stable,current} CURRENT_FILE=${1:-/tmp/openbsd_app/current/share/sqlports} STABLE_FILE=${2:-/tmp/openbsd_app/stable/share/sqlports} +SIGNIFY="${SIGNIFY:-signify}" +CURRENT_PUB=$(readlink -f /etc/signify/openbsd-73-pkg.pub) +STABLE_PUB=$(readlink -f /etc/signify/openbsd-73-pkg.pub) ( cd /tmp/openbsd_app/current curl -L -O https://cdn.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/sqlports-7.38.tgz curl -L -O https://cdn.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/SHA256.sig - signify -C -p /etc/signify/openbsd-73-pkg.pub -x SHA256.sig sqlports-7.38.tgz + ${SIGNIFY} -C -p ${CURRENT_PUB} -x SHA256.sig sqlports-7.38.tgz tar -C . -zxvf sqlports-7.38.tgz ) @@ -19,7 +22,7 @@ STABLE_FILE=${2:-/tmp/openbsd_app/stable/share/sqlports} cd /tmp/openbsd_app/stable curl -L -O https://cdn.openbsd.org/pub/OpenBSD/7.3/packages/amd64/sqlports-7.37.tgz curl -L -O https://cdn.openbsd.org/pub/OpenBSD/7.3/packages/amd64/SHA256.sig - signify -C -p /etc/signify/openbsd-73-pkg.pub -x SHA256.sig sqlports-7.37.tgz + ${SIGNIFY} -C -p ${STABLE_PUB} -x SHA256.sig sqlports-7.37.tgz tar -C . -zxvf sqlports-7.37.tgz ) @@ -32,16 +35,18 @@ SQL=$(cat <