printf "%s" "$clean"
}
+verbose=0
tags=
isconfig=0
+addcontent=1
# 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:N 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=1 ;;
+ *) echo 'unknown option' $OPTARG; exit 1 ;;
esac
done
shift $((OPTIND - 1))
tags="$tags configuration"
fi
+if [ $verbose -gt 1 ]; then
+ set -x
+fi
+
pkgid="$1"
shift
eval $(zpm parse -E $pkgid)
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
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")
rpath="$prefix/$rpath"
fi
- filetype=$(zpm stat -f '%t' "$path")
+ 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'"
;;
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