add sync columns for old metadata on update

[zpackage] / zpm-add

diff --git a/zpm-add b/zpm-add
index 2621b596cedf08bc7e391427932b7ce16c2374f6..7de51e9eb9f5322d135bcb85af375129bef79552 100755 (executable)
--- a/zpm-add
+++ b/zpm-add
@@ -32,12 +32,15 @@ cleanpath() {
 verbose=0
 tags=
 isconfig=0
+addcontent=1
+complete=0
 # option for "multipackage" just to let the system know that's what you meant
 # option to take filenames from stdin
 # parse package, version, release from file if not given
 # TODO -l follow symlinks, -L follow symlinks, adding all, links and targets
-while getopts :f:vr:l:P:S:cu:g: opt; do
+while getopts :f:vr:l:P:S:cu:g:NC opt; do
        case $opt in
+               N) addcontent=0 ;;
                f) pkgfile="$OPTARG" ;;
                P) prefix="$OPTARG" ;;
                S) strip=$(cleanpath "$OPTARG"); ;;
@@ -46,6 +49,7 @@ while getopts :f:vr:l:P:S:cu:g: opt; do
                u) username="$OPTARG" ;;
                g) groupname="$OPTARG" ;;
                v) verbose=1 ;;
+               C) complete=1 ;;
                *) echo 'unknown option' $OPTARG; exit 1 ;;
        esac
 done
@@ -71,7 +75,7 @@ if [ -z "$release" ]; then
        if [ -z "$pkgfile" ]; then
                die "cannot determine package file"
        else
-               pkgstr=$(zpm findpkg $pkgfile $pkgid)
+               pkgstr=$(zpm findpkg -f $pkgfile $pkgid)
                if [ -z "$pkgstr" ]; then
                        die "unable to find package id for $pkgid in $pkgfile"
                fi
@@ -149,9 +153,13 @@ for path in $*; do
        case "$filetype" in
                regular)
                        filetype=r
-                       hash=$(zpm addfile $pkgfile "$path")
-                       if [ $? -ne 0 ]; then
-                               die "zpm addfile failed ($?): $pkgfile $path" 
+                       if [ $addcontent -eq 1 ]; then
+                               hash=$(zpm addfile $pkgfile "$path")
+                               if [ $? -ne 0 ]; then
+                                       die "zpm addfile failed ($?): $pkgfile $path" 
+                               fi
+                       else
+                               hash=$(zpm hash "$path")
                        fi
                        hash="'$hash'"
                        ;;
@@ -168,7 +176,6 @@ for path in $*; do
        # TODO check that we have such a package,version,release
        #cat <<EOS
        zpm shell $pkgfile <<EOS
-PRAGMA foreign_keys = ON;
 begin;
 insert or replace into packagefiles (package,version,release,path,mode,mtime,username,groupname,filetype,hash,target)
 values ('$package', '$pkgver', $pkgrel, '$rpath', '$mode',$mtime, '$username','$groupname','$filetype',$hash,$target);
@@ -176,5 +183,15 @@ commit;
 EOS
 
 #printf "%s %s%s\n" $path $rpath ${target:+" -> $target"}
-printf "%s\n" $path
+if [ $verbose -gt 0 ]; then
+       printf "%s\n" $path
+fi
+
 done
+
+if [ $complete -eq 1 ]; then
+       zpm pkg -f $pkgfile $pkgid build_time=$(date +'%s')
+       zpm packagehash -f $pkgfile -s -q $pkgid
+else
+       zpm pkg -f $pkgfile $pkgid hash=
+fi