more chatter in zpm-install

diff --git a/zpm-install b/zpm-install
index be851acf905259657a0ca500c385daa30f838795..26095d26bd0ec80ba48e489e7cdbf9d5a18278dd 100755 (executable)
--- a/zpm-install
+++ b/zpm-install
@@ -93,7 +93,11 @@ for pkg in $pkglist; do
        # zpm setmark installing $pkg
        # install all the files for a package
        # TODO install directories first in order of path length
        # zpm setmark installing $pkg
        # install all the files for a package
        # TODO install directories first in order of path length

-       pathlist | xargs zpm ipkgfile -R "$pkgroot" -f $pkgfile -- $pkg 
+       echo installing $pkglist
+       filecount=$(pathlist | wc -l)
+       echo $filecount files
+       pathlist
+       pathlist | xargs -t zpm ipkgfile -R "$pkgroot" -f $pkgfile -- $pkg

 
        # TODO find scripts marked as post-install
        # TODO if this is an upgrade, run post-upgrade
 
        # TODO find scripts marked as post-install
        # TODO if this is an upgrade, run post-upgrade

diff --git a/zpm-ipkgfile b/zpm-ipkgfile
index 088f807a805a3e6f0139897373d8258da0baddc0..a7be95a862fdecdeaf6a9b1634bdfa49ce2cc9dc 100755 (executable)
--- a/zpm-ipkgfile
+++ b/zpm-ipkgfile
@@ -42,21 +42,26 @@ fi
 pkg="$1"
 shift
 
 pkg="$1"
 shift
 

+ZPMPKGFILE=$pkgfile
+export ZPMPKGFILE
+

 set -e
 for path in $*; do
 set -e
 for path in $*; do

+       echo installing $path from $pkg
+       set -x

        fhash=$(zpm pkgfileinfo hash $path)
        mode=$(zpm pkgfileinfo mode $path)
        fhash=$(zpm pkgfileinfo hash $path)
        mode=$(zpm pkgfileinfo mode $path)

+       ftype=$(zpm pkgfileinfo filetype $path)

        owner=$(zpm pkgfileinfo username $path)
        group=$(zpm pkgfileinfo groupname $path)
        owner=$(zpm pkgfileinfo username $path)
        group=$(zpm pkgfileinfo groupname $path)

-       ftype=$(zpm pkgfileinfo filetype $path)
+

        name=$(basename -- $path)
        name=$(basename -- $path)

+       dir=$(dirname -- $path)

 
        if [ "$pkgroot" != '/' ]; then
 
        if [ "$pkgroot" != '/' ]; then

-               dir=$pkgroot/$(dirname -- $path)
+               dir=$pkgroot/$dir

                dir=${dir%/.}
                if [ "$dir" = "//" ]; then dir=/ ; fi
                dir=${dir%/.}
                if [ "$dir" = "//" ]; then dir=/ ; fi

-       else
-               dir=''

        fi
 
        tmppath=$dir/.installing.$name
        fi
 
        tmppath=$dir/.installing.$name