tryrun zpm newpackage -f $pkgid.zpm $pkgid
if [ $? -eq 0 ]; then
shift
- tryrun zpm add -u $owner -g $group -f $pkgid.zpm $pkgid "$@"
+ tryrun zpm add -u $owner -g $group -f $pkgid.zpm -p $pkgid "$@"
return $?
else
skip 1 not adding files init failed
#require zpm init $PF
#require zpm newpackage -f $PF $pkgid
-#require zpm add -f $PF $pkgid /bin/true
+#require zpm add -f $PF -p $pkgid /bin/true
#
# install via syncfs
#
require zpm pkg -f $PF $pkgid status=installing
-zpm syncfs -d $PF -R. $pkgid 2>&1
+zpm syncfs -d $PF -R. $pkgid 2>&1 | diagstdin
okexit ran syncfs
test -f bin/true
# TODO should probably have merge set the status to merged by default
require zpm init local.db
-zpm install -R. -d local.db -f $PF $pkgid
+zpm install -R. -d local.db -f $PF $pkgid 2>&1 | diagstdin
#zpm list -f local.db -v | diagstdin
okexit installed
ns=$(zpm pkg -f local.db $pkgid status)
okstreq "$newver" "2.0" "have updated version"
rm -f test.out
-tryrun zpm add -f $PF itest /bin/false
+tryrun zpm add -f $PF -p itest /bin/false
if [ $? -ne 0 ]; then
diag h2
cat test.out | diagstdin
bailout add failed
fi
-zpm install -R. -d local.db -f $PF itest-2.0-1
+zpm install -R. -d local.db -f $PF itest-2.0-1 2>&1 | diagstdin
okexit installed
if [ $? -ne 0 ]; then
cat test.out | diagstdin
newpkg $pkgid /bin/true
okexit setup package $pkgid
PF=$pkgid.zpm
-zpm install -R. -d local.db -f $PF $pkgid | diagstdin
+zpm install -R. -d local.db -f $PF $pkgid 2>&1 | diagstdin
okexit upgraded to $pkgid
ns=$(zpm pkg -f local.db $pkgid status)
okexit setup package $pkgid
require rm bin/sh
PF=$pkgid.zpm
-zpm install -R. -d local.db -f $PF $pkgid | diagstdin
+zpm install -R. -d local.db -f $PF $pkgid 2>&1 | diagstdin
okexit installed $pkgid
oktest -f bin/sh
okexit setup package $pkgid
require mv bin/save bin/true
PF=$pkgid.zpm
-zpm install -R. -d local.db -f $PF $pkgid | diagstdin
+zpm install -R. -d local.db -f $PF $pkgid 2>&1 | diagstdin
okexit installed $pkgid
rhash=$(zpm hash bin/true)
okstreq "$rhash" "$nhash" "updated bin/true"