PF=test.db
-plan 17
+plan 20
td=test.addtopackage
rm -rf $td
echo foo > $td/foo
okexit 'making foo'
-rm -f zpmtest-1.0-1.zpm
+pkgid=zpmtest-1.0-1
+
+rm -f $pkgid.zpm
-require zpm add -C zpmtest $td/foo
+require zpm newpackage -C $pkgid
+require zpm add $pkgid $td/foo
h=$(zpm hash $td/foo)
require zpm extract zpmtest-1.0-1.zpm $h $td/foo2
h2=$(zpm hash $td/foo2)
okstreq "$4" "$td/foo" file foo in package
diag "$pkglist"
-rm zpmtest-1.0-1.zpm
+rm -f zpmtest-1.0-1.zpm
-require zpm add -C -f $PF zpmtest $td/foo
+rm -f $PF
+require zpm newpackage -f $PF -C $pkgid
+require zpm add -f $PF zpmtest $td/foo
rm -f $td/foo2
require zpm extract $PF $h $td/foo2
h2=$(zpm hash $td/foo2)
diag "$pkglist"
rm -f $PF
-require zpm add -C -f $PF -S "$td" zpmtest $td/foo
+require zpm newpackage -f $PF -C $pkgid
+require zpm add -f $PF -S "$td" zpmtest $td/foo
fn=$(zpm showpkg $PF | awk '{print $4}')
okstreq "$fn" "foo" file foo in package prefix striped
+rm -f $PF
finish
rm -rf $td
-rm -f $PF
-rm -f zpmtest-1.0-1.zpm