diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cpt-export | 22 | ||||
| -rwxr-xr-x | contrib/cpt-new | 6 |
2 files changed, 16 insertions, 12 deletions
diff --git a/contrib/cpt-export b/contrib/cpt-export index 9b4edd1..d0ce36a 100755 --- a/contrib/cpt-export +++ b/contrib/cpt-export @@ -3,7 +3,7 @@ case "$1" in --help|-h) - printf '\033[1;33m-> \033[m%s\n' "usage: ${0##*/} [pkg]" + printf 'usage: %s [pkg]\n' "${0##*/}" exit 0 ;; '') set -- "${PWD##*/}" @@ -15,23 +15,27 @@ cpt-list "${1:-null}" >/dev/null read -r ver rel 2>/dev/null < \ "$CPT_ROOT/var/db/cpt/installed/$1/version" +# Fallback to gzip if there is a typo +case "$CPT_COMPRESS" in bz2|gz|xz|zst) ;; *) CPT_COMPRESS=gz; esac + # Reset the argument list. pkg=$1 +tarball="$PWD/$1#$ver-$rel.tar.$CPT_COMPRESS" set -- # Construct the argument list using each file. -while read -r file; do - [ -d "$CPT_ROOT/$file" ] || set -- "$@" ".$file" -done < "$CPT_ROOT/var/db/cpt/installed/$pkg/manifest" +eval set -- "$(sed '/\/$/d;s|^|".|;s|$|"|' \ + "$CPT_ROOT/var/db/cpt/installed/$pkg/manifest" | tr '\n' ' ')" # Turn the list of files back into a package. -: "${CPT_COMPRESS:=gz}" -tar cf - -C / -- "$@" | case "$CPT_COMPRESS" in +cd "$CPT_ROOT/" +tar cf - -- "$@" | + +case "$CPT_COMPRESS" in bz2) bzip2 -z ;; gz) gzip -6 ;; xz) xz -zT 0 ;; zst) zstd -3 ;; - *) gzip -6 ;; # Fallback to gzip -esac > "$pkg#$ver-$rel.tar.$CPT_COMPRESS" +esac > "$tarball" -printf 'tarball created in %s\n' "$PWD/$pkg#$ver-$rel.tar.$CPT_COMPRESS" +printf 'tarball created in %s\n' "$tarball" diff --git a/contrib/cpt-new b/contrib/cpt-new index 00b99c2..b5eac9c 100755 --- a/contrib/cpt-new +++ b/contrib/cpt-new @@ -1,10 +1,10 @@ #!/bin/sh -e # Create a boilerplate CPT package -out() { printf '\033[1;33m-> \033[m%s\n' "$@" >&2 ;} +out() { printf '%s\n' "$@" ;} die() { printf '\033[1;31m!> \033[m%s\n' "$@" >&2 ; exit 1 ;} -case "$1" in ''|--help|-h) out "usage: ${0##*/} [name] [version] [source]"; exit 0; esac +case "$1" in ''|--help|-h) out "usage: ${0##*/} [pkg] [version] [source]"; exit 0; esac [ -d "$1" ] && die "Package '$1' already exists." @@ -20,4 +20,4 @@ printf '%s\n' "$2 1" > "$1/version" # Create the sources file printf '%s\n' "$3" > "$1/sources" -out "Package '$1' created to '$PWD/$1'" +out "Package '${1##*/}' created to '$PWD/$1'" >&2 |