epm-sh-install: __epm_check_vendor(): print package filename without temp. path

d3887081 · Vitaly Lipatov · 2ac21799 · d3887081
Commit d3887081 authored May 05, 2023 by Vitaly Lipatov
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

epm-sh-install bin/epm-sh-install +6 -5

No files found.
--- a/bin/epm-sh-install
+++ b/bin/epm-sh-install
@@ -144,10 +144,11 @@ __epm_check_vendor()

    local i
    for i in $* ; do
+        bi="$(basename $i)"
        if ! epm_status_validate "$i" ; then
            # it is missed package probably (package remove case)
            if is_installed "$i" ; then
-                warning "Can't get any info for $i package. Scripts are DISABLED for package $i. Use --scripts if you need run scripts from such packages."
+                warning "Can't get any info for $i package. Scripts are DISABLED for package $bi. Use --scripts if you need run scripts from such packages."
            fi
            noscripts="--noscripts"
            continue
@@ -157,7 +158,7 @@ __epm_check_vendor()
        vendor="$(epm print field Vendor for "$i")"

        if [ -z "$vendor" ] ; then
-            warning "Can't get info about vendor for $i package. Scripts are DISABLED for package $i. Use --scripts if you need run scripts from such packages."
+            warning "Can't get info about vendor for $i package. Scripts are DISABLED for package $bi. Use --scripts if you need run scripts from such packages."
            noscripts="--noscripts"
            continue
        fi
@@ -166,15 +167,15 @@ __epm_check_vendor()
        epm_status_repacked "$i" && continue

        if __epm_vendor_ok_scripts "$vendor" ; then
-            warning "Scripts are ENABLED for package $i from outside vendor '$vendor' (this vendor is listed in $CONFIGDIR/vendorallowscripts.list).  Use --noscripts if you need disable scripts in such packages."
+            warning "Scripts are ENABLED for package $bi from outside vendor '$vendor' (this vendor is listed in $CONFIGDIR/vendorallowscripts.list).  Use --noscripts if you need disable scripts in such packages."
            continue
        fi

        if __epm_package_ok_scripts "$i" ; then
-            warning "Scripts are ENABLED for package $i from outside vendor '$vendor' (the package is listed in $CONFIGDIR/pkgallowscripts.list).  Use --noscripts if you need disable scripts in such packages."
+            warning "Scripts are ENABLED for package $bi from outside vendor '$vendor' (the package is listed in $CONFIGDIR/pkgallowscripts.list).  Use --noscripts if you need disable scripts in such packages."
            continue
        fi
-        warning "Scripts are DISABLED for package $i from outside vendor '$vendor'. Use --scripts if you need run scripts from such packages."
+        warning "Scripts are DISABLED for package $bi from outside vendor '$vendor'. Use --scripts if you need run scripts from such packages."
        noscripts="--noscripts"
    done
 }