From bcb55a8700fccd69af1c854c128146d41fbac182 Mon Sep 17 00:00:00 2001 From: emmett1 Date: Mon, 27 May 2024 01:05:56 +0800 Subject: updated --- apkg | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'apkg') diff --git a/apkg b/apkg index 651f1e2..407d654 100755 --- a/apkg +++ b/apkg @@ -407,12 +407,10 @@ pkg_deplist() { } pkg_fsearch() { - #set -x for r in $APKG_REPO; do rr="$rr $r/*/.files" done - grep $1 $rr 2>/dev/null | tr ':' ' ' | awk '{print $1,$4}' | sed 's,/.files,,g' #| rev | cut -d / -f 2 | rev - #cut -d ' ' -f3- $rr | grep $1 + grep $1 $rr 2>/dev/null | tr ':' ' ' | awk '{print $1,$4}' | sed 's,/.files,,g' } pkg_dependents() { @@ -457,10 +455,7 @@ pkg_sysup() { done if [ "$ni" ]; then newpkg=$(echo $ni | tr ' ' '\n' | wc -l) - msg "Installing $newpkg new package(s)." - echo - echo $ni - echo + msg "Installing $newpkg new package(s): $ni" fi totalpkg=$(echo $pu | tr ' ' '\n' | wc -l) msg "Upgrading $totalpkg package(s): $pu" @@ -649,7 +644,11 @@ main() { . ./info [ "$name" ] || die "name is empty" [ "$version" ] || die "version is empty" - [ "$release" ] || die "release is empty" + [ "$release" ] || die "release is empty" + [ "$name" = "${PWD##*/}" ] || { + msg "'name' should be same as package directory name (${PWD##*/})." + exit 1 + } export name version release packagefile=$APKG_PACKAGE_DIR/$name#$version-$release.spm -- cgit v1.2.3