add -m option to add to set file mode

[zpackage] / zpm-add

diff --git a/zpm-add b/zpm-add
index 4025bde71ee60b290e300f91cdf186a1c629d452..68c986dbfc05a365a3dadce4c2804296efd683fe 100755 (executable)
--- a/zpm-add
+++ b/zpm-add
@@ -29,13 +29,19 @@ cleanpath() {
        printf "%s" "$clean"
 }
 
+verbose=0
 tags=
 isconfig=0
+addcontent=1
+complete=0
+mode=
 # 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
-while getopts :f:v:r:l:P:S:cu:g: opt; do
+# TODO -l follow symlinks, -L follow symlinks, adding all, links and targets
+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"); ;;
@@ -43,7 +49,10 @@ while getopts :f:v:r:l:P:S:cu:g: opt; do
                c) isconfig=1 ;;
                u) username="$OPTARG" ;;
                g) groupname="$OPTARG" ;;
-               *) echo 'unknown option' $opt; exit 1 ;;
+               m) mode="$OPTARG" ;;
+               v) verbose=$((verbose + 1)) ;;
+               C) complete=1 ;;
+               *) echo 'unknown option' $OPTARG; exit 1 ;;
        esac
 done
 shift $((OPTIND - 1))
@@ -52,6 +61,10 @@ if [ $isconfig -eq 1 ]; then
        tags="$tags configuration"
 fi
 
+if [ $verbose -gt 2 ]; then
+       set -x
+fi
+
 pkgid="$1"
 shift
 eval $(zpm parse -E $pkgid)
@@ -64,7 +77,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
@@ -83,15 +96,19 @@ if [ -z "$pkgfile" ]; then
        die "cannot determine package file"
 fi
 
-set -e
-
 # check for package file
 if [ ! -f "$pkgfile" ]; then
        echo $pkgfile does not exist
        exit 1
 fi
 
+set -e
 zpm test -v $pkgfile
+set +e
+
+if [ $verbose -gt 0 ]; then
+       echo adding to $pkgfile $pkgid
+fi
 
 package=$(zpm quote "$name")
 pkgver=$(zpm quote "$version")
@@ -103,9 +120,16 @@ for path in $*; do
        mtime=$(zpm stat -f '%y' $path)
        uid=$(zpm stat -f '%u' $path)
        gid=$(zpm stat -f '%g' $path)
+
+       if [ -z "$mode" ]; then
+               mode=$(zpm stat -f '%a' $path)
+       fi
+
+       # only stat the file for the user and group name if not set on the
+       # command line
        : ${username:=$(zpm stat -f '%U' $path)}
        : ${groupname:=$(zpm stat -f '%G' $path)}
-       mode=$(zpm stat -f '%a' $path)
+
        rpath="$path"
 
        rpath=$(cleanpath "$path")
@@ -118,7 +142,6 @@ for path in $*; do
        fi
 
        if [ ! -z "$strip" ]; then
-               echo "stripping $strip"
                rpath=${rpath#$strip}
                rpath=${rpath#/}
        fi
@@ -132,15 +155,22 @@ for path in $*; do
                rpath="$prefix/$rpath"
        fi
 
-       filetype=$(zpm stat -f '%t' "$path")
+       # ensure all paths are absolute
+       rpath=/${rpath#/}
+
+       filetype=$(zpm stat -l -f '%t' "$path")
        hash='NULL'
        target='NULL'
        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'"
                        ;;
@@ -157,13 +187,24 @@ 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);
+insert or replace into packagefiles (package,version,release,path,mode,mtime,username,groupname,filetype,hash,configuration,target)
+values ('$package', '$pkgver', $pkgrel, '$rpath', '$mode',$mtime, '$username','$groupname','$filetype',$hash,$isconfig,$target);
 commit;
 EOS
 
 #printf "%s %s%s\n" $path $rpath ${target:+" -> $target"}
-printf "%s\n" $path
+if [ $verbose -gt 1 ]; then
+       printf "%s%s %s:%s %s\n" $filetype $mode $username $groupname $path
+elif [ $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