change findpkg to use -f option

[zpackage] / zpm-install

diff --git a/zpm-install b/zpm-install
index 994ed195d14bc5c24ed7a68d4b0e24eaaa9bba1a..47681d3c56d3dea0d2590fdb121a65efabc33514 100755 (executable)
--- a/zpm-install
+++ b/zpm-install
@@ -98,6 +98,17 @@ if [ $var -gt 0 ]; then
        zpm list -v -f $localdb -s installing 
        die "already ($localdb) installing $var package(s)"
 fi
+# check if we're installing something already
+var=$(zpm list -f $localdb -s removing | wc -l)
+if [ $var -gt 0 ]; then
+       zpm list -v -f $localdb -s removing 
+       die "already ($localdb) removing $var package(s)"
+fi
+var=$(zpm list -f $localdb -s updating | wc -l)
+if [ $var -gt 0 ]; then
+       zpm list -v -f $localdb -s updating 
+       die "already ($localdb) updating $var package(s)"
+fi
 
 if [ -n "$rootdir" ]; then
        ZPM_ROOT_DIR="$rootdir"
@@ -106,7 +117,7 @@ fi
 
 # TODO mark already installed packages as updating?
 for pkgstr in "$@"; do
-       pkgid=$(zpm findpkg $pkgfile $pkgstr)
+       pkgid=$(zpm findpkg -f $pkgfile $pkgstr)
        if [ $? -ne 0 ]; then
                # TODO log
                die "can't find package $pkgstr in $pkgfile"
@@ -119,6 +130,7 @@ for pkgstr in "$@"; do
 
        eval $(zpm parse -E $pkgid)
 
+       #zpm list -v
        current=$(zpm list -s installed "$package")
        
        if [ $runscripts -gt 0 ]; then
@@ -137,19 +149,21 @@ for pkgstr in "$@"; do
                        die "merging $pkgid failed"
                fi
        fi
+       # TODO but need to mark as installing if not merged
 
+       #zpm shell $ZPMDB 'select * from install_status' 1>&2
        if [ $dryrun -gt 0 ]; then
                #zpm list -v
                #zpm shell $ZPMDB 'select * from install_status'
-               zpm pkgfiles -nv -f $pkgfile $pkgid
+               zpm syncfs -nv -f $pkgfile
                zpm pkg $pkgid status=dryrun
                continue
        fi
 
-       zpm pkgfiles -f $pkgfile $pkgid
+       zpm syncfs -f $pkgfile
 
        if [ $? -ne 0 ]; then
-               die 'zpm-pkgfiles failed';
+               die 'zpm-syncfs failed';
        fi
 
        if [ $runscripts -gt 0 ]; then
@@ -162,6 +176,8 @@ for pkgstr in "$@"; do
                zpm pkg $pkgid status=installed
        fi
 
+       # TODO skip configure if not on a terminal, regardless of settings
+       # TODO will need force option
        if [ $runconfigure -gt 0 ]; then
                zpm runscript -f $pkgfile -p configure $pkgid $current
        fi