printf "%s" "$clean"
}
+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
-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"); ;;
c) isconfig=1 ;;
u) username="$OPTARG" ;;
g) groupname="$OPTARG" ;;
- *) echo 'unknown option' $opt; exit 1 ;;
+ v) verbose=$((verbose + 1)) ;;
+ C) complete=1 ;;
+ *) echo 'unknown option' $OPTARG; exit 1 ;;
esac
done
shift $((OPTIND - 1))
tags="$tags configuration"
fi
+if [ $verbose -gt 2 ]; then
+ set -x
+fi
+
pkgid="$1"
shift
-set -x
eval $(zpm parse -E $pkgid)
-if [ -z "$pkgfile" ];
+if [ -z "$pkgfile" ]; then
pkgfile=$ZPM_PACKAGE_FILE
fi
+if [ -z "$release" ]; then
+ if [ -z "$pkgfile" ]; then
+ die "cannot determine package file"
+ else
+ pkgstr=$(zpm findpkg -f $pkgfile $pkgid)
+ if [ -z "$pkgstr" ]; then
+ die "unable to find package id for $pkgid in $pkgfile"
+ fi
+ pkgid=$pkgstr
+ # need to reparse the new package id
+ eval $(zpm parse -E $pkgid)
+ fi
+fi
+
# look for a .zpm file here
-if [ -z "$pkgfile" ] && [ -n "$release" ] && [ -f "$pkgid.zpm" ];
+if [ -z "$pkgfile" ] && [ -f "$pkgid.zpm" ]; then
pkgfile="$pkgid.zpm"
fi
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 [ -z "$release" ]; then
- pkgstr=$(zpm findpkg -f $pkgfile $pkgid)
+if [ $verbose -gt 0 ]; then
+ echo adding to $pkgfile $pkgid
fi
-if [ -z "$pkgstr" ]; then
- die "unable to find package id for $pkgid"
-fi
-pkgid=$pkgstr
+package=$(zpm quote "$name")
+pkgver=$(zpm quote "$version")
+pkgrel=$(zpm quote "$release")
#strip=$(cleanpath "$strip")
for path in $*; do
mtime=$(zpm stat -f '%y' $path)
uid=$(zpm stat -f '%u' $path)
gid=$(zpm stat -f '%g' $path)
+ mode=$(zpm stat -f '%a' $path)
+
+ # 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")
fi
if [ ! -z "$strip" ]; then
- echo "stripping $strip"
rpath=${rpath#$strip}
rpath=${rpath#/}
fi
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'"
;;
esac
# 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