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
+# -T set link target
+# -M set mtime
+# -m set mode
+# -H set hash, will be overridden for regular files unless -N is set
+# -F set filetype, regular, symlink, directory
+while getopts :f:vr:l:P:S:cu:g:NCm:M:T:H:F: opt; do
case $opt in
+ N) addcontent=0 ;;
f) pkgfile="$OPTARG" ;;
P) prefix="$OPTARG" ;;
S) strip=$(cleanpath "$OPTARG"); ;;
t) tags="$tags $OPTARG" ;;
c) isconfig=1 ;;
- u) username="$OPTARG" ;;
- g) groupname="$OPTARG" ;;
- v) verbose=1 ;;
+ u) cluser="$OPTARG" ;;
+ g) clgroup="$OPTARG" ;;
+ m) clmode="$OPTARG" ;;
+ M) clmtime="$OPTARG" ;;
+ T) cltarget="$OPTARG" ;;
+ F) cltype="$OPTARG" ;;
+ H) clhash="$OPTARG" ;;
+ v) verbose=$((verbose + 1)) ;;
+ C) complete=1 ;;
*) echo 'unknown option' $OPTARG; exit 1 ;;
esac
done
tags="$tags configuration"
fi
-if [ $verbose -gt 1 ]; then
+if [ $verbose -gt 2 ]; then
set -x
fi
#strip=$(cleanpath "$strip")
for path in $*; do
#echo adding $path
- mtime=$(zpm stat -f '%y' $path)
- uid=$(zpm stat -f '%u' $path)
- gid=$(zpm stat -f '%g' $path)
- : ${username:=$(zpm stat -f '%U' $path)}
- : ${groupname:=$(zpm stat -f '%G' $path)}
- mode=$(zpm stat -f '%a' $path)
+if [ $verbose -gt 0 ]; then
+ printf "adding %s\n" $path
+fi
+
+ # only stat the file for items not set on the command line
+ mode=${clmode:-$(zpm stat -l -f '%a' $path)}
+ username=${cluser:-$(zpm stat -l -f '%U' $path)}
+ groupname=${clgroup:-$(zpm stat -l -f '%G' $path)}
+ mtime=${clmtime:-$(zpm stat -l -f '%y' $path)}
+ filetype=${cltype:-$(zpm stat -l -f '%t' "$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 -l -f '%t' "$path")
+ # ensure all paths are absolute
+ rpath=/${rpath#/}
+
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
+ if [ -z "$clhash" ]; then
+ hash=$(zpm hash "$path")
+ else
+ hash=$clhash
+ fi
fi
hash="'$hash'"
;;
;;
symlink)
filetype=l
- target=$(readlink $path)
- target="'$target'"
+ if [ -n "$cltarget" ]; then
+ target=$cltarget
+ else
+ target=$(readlink $path)
+ target=$(zpm quote -q "$target")
+ fi
+ ;;
+ *)
+ die "filetype $filetype not supported"
;;
esac
# TODO check that we have such a package,version,release
#cat <<EOS
+ if [ $verbose -gt 2 ]; then
+ shellecho=".echo on"
+ fi
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);
+$shellecho
+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"}
-if [ $verbose -gt 0 ]; then
+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