cleanup package tests

diff --git a/t/addfile.t b/t/addfile.t
index a2fe02f63388b0d8fc555624ecff4c5602ae2ef8..4a7de4f38405cf686b47e847ce9f09290c87ab7b 100755 (executable)
--- a/t/addfile.t
+++ b/t/addfile.t
@@ -31,4 +31,4 @@ failsok fail to device file
 
 finish
 
 
 finish
 

-rm -f test.*
+rm -f $PF test.empty

diff --git a/t/addtopackage.t b/t/addtopackage.t
index 7fcb91f4c78185188bf6b767aabbd618f36b6c5d..e8b0720609c6ee3e45f8be7a91bd43cf9781aa37 100755 (executable)
--- a/t/addtopackage.t
+++ b/t/addtopackage.t
@@ -17,7 +17,7 @@ okexit 'making foo'
 
 rm -f zpmtest-1.0-1.zpm
 
 
 rm -f zpmtest-1.0-1.zpm
 

-require zpm addtopackage zpmtest $td/foo
+require zpm addtopackage -C zpmtest $td/foo

 h=$(zpm hash $td/foo)
 require zpm extract zpmtest-1.0-1.zpm $h $td/foo2
 h2=$(zpm hash $td/foo2)
 h=$(zpm hash $td/foo)
 require zpm extract zpmtest-1.0-1.zpm $h $td/foo2
 h2=$(zpm hash $td/foo2)


@@ -33,7 +33,7 @@ diag "$pkglist"
 
 rm zpmtest-1.0-1.zpm
 
 
 rm zpmtest-1.0-1.zpm
 

-require zpm addtopackage -f $PF zpmtest $td/foo
+require zpm addtopackage -C -f $PF zpmtest $td/foo

 rm -f $td/foo2
 require zpm extract $PF $h $td/foo2
 h2=$(zpm hash $td/foo2)
 rm -f $td/foo2
 require zpm extract $PF $h $td/foo2
 h2=$(zpm hash $td/foo2)


@@ -48,7 +48,7 @@ okstreq "$4" "$td/foo" file foo in package
 diag "$pkglist"
 
 rm -f $PF
 diag "$pkglist"
 
 rm -f $PF

-require zpm addtopackage -f $PF -S "$td" zpmtest $td/foo
+require zpm addtopackage -C -f $PF -S "$td" zpmtest $td/foo

 fn=$(zpm showpkg $PF | awk '{print $4}')
 okstreq "$fn" "foo" file foo in package prefix striped
 
 fn=$(zpm showpkg $PF | awk '{print $4}')
 okstreq "$fn" "foo" file foo in package prefix striped
 

diff --git a/zpm-addtopackage b/zpm-addtopackage
index a2e5aeec4c86c3a25c811b31b585d2c7010b4651..81c1bcb5b1cbc9fe7f8417de6bd4e54cd238b672 100755 (executable)
--- a/zpm-addtopackage
+++ b/zpm-addtopackage
@@ -26,24 +26,23 @@ cleanpath() {
        printf "%s" "$clean"
 }
 
        printf "%s" "$clean"
 }
 

+tags=
+create=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
 # 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:d:a:u:l:p:b:P:S: opt; do
+while getopts :f:v:r:l:P:S:Cc opt; do

        case $opt in
                f) pkgfile="$OPTARG" ;;
                v) pkgver="$OPTARG" ;;
                r) pkgrel="$OPTARG" ;;
        case $opt in
                f) pkgfile="$OPTARG" ;;
                v) pkgver="$OPTARG" ;;
                r) pkgrel="$OPTARG" ;;

-               d) description="$OPTARG" ;;
-               a) arch="$OPTARG" ;;
-               u) url="$OPTARG" ;;

                l) licenses="$OPTARG" ;;
                l) licenses="$OPTARG" ;;

-               p) packager="$OPTARG" ;;
-               b) builddate="$OPTARG" ;;

                P) prefix="$OPTARG" ;;
                S) strip=$(cleanpath "$OPTARG"); ;;
                P) prefix="$OPTARG" ;;
                S) strip=$(cleanpath "$OPTARG"); ;;

-               t) tags="$OPTARG" ;;
-               c) tags="$tags +configuration" ;;
+               t) tags="$tags $OPTARG" ;;
+               c) tags="$tags configuration" ;;
+               C) create=1 ;;
+               *) echo 'unknown option'; exit 1 ;;

        esac
 done
 shift $((OPTIND - 1))
        esac
 done
 shift $((OPTIND - 1))


@@ -59,13 +58,22 @@ if [ -z "$pkgfile" ]; then
        pkgfile="$package-$pkgver-$pkgrel.zpm"
 fi
 
        pkgfile="$package-$pkgver-$pkgrel.zpm"
 fi
 

-# make sure package exists
-zpm newpackage -I -f $pkgfile -v $pkgver -r $pkgrel $package || exit 1
+# check for package file
+if [ ! -f "$pkgfile" ]; then
+       if [ $create -eq 1 ]; then
+               echo creating $pkgfile
+               zpm newpackage -I -f $pkgfile -v $pkgver -r $pkgrel $package || exit 1
+       else
+               echo $pkgfile does not exist
+               exit 1
+       fi
+fi

 
 zpm test -v $pkgfile
 
 #strip=$(cleanpath "$strip")
 for path in $*; do
 
 zpm test -v $pkgfile
 
 #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)
        mtime=$(zpm stat -f '%y' $path)
        uid=$(zpm stat -f '%u' $path)
        gid=$(zpm stat -f '%g' $path)