On 13/3/19 3:28 am, Eli Schwartz wrote: > Currently the list of supported formats for an archive, is maintained in > two places. And repo-add does not actually get updated. :( > > In the process, remove some of the logical duplication when calling > bsdtar/compress_as. Also, move to emulating makepkg by not returning a > hard error if given an invalid archive extension; compress_as will > accept it, throw a warning, and proceed using `cat` as the compression > filter, which pacman consumes just as well. > > Signed-off-by: Eli Schwartz <[email protected]> > --- > > v2: use a better argument to compress_as, expand the commit message a > bit to clarify the practical effects of the change. > > scripts/repo-add.sh.in | 27 +++++++++------------------ > 1 file changed, 9 insertions(+), 18 deletions(-) > > diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in > index 57413df5..ec2838a7 100644 > --- a/scripts/repo-add.sh.in > +++ b/scripts/repo-add.sh.in > @@ -44,6 +44,7 @@ CLEAN_LOCK=0 > USE_COLOR='y' > > # Import libmakepkg > +source "$LIBRARY"/util/compress.sh > source "$LIBRARY"/util/message.sh > > # ensure we have a sane umask set > @@ -188,21 +189,12 @@ verify_signature() { > } > > verify_repo_extension() { > - local repofile=$1 > - > - case $repofile in > - *.db.tar.gz) TAR_OPT="z" ;; > - *.db.tar.bz2) TAR_OPT="j" ;; > - *.db.tar.xz) TAR_OPT="J" ;; > - *.db.tar.zst) TAR_OPT="--zstd" ;; > - *.db.tar.Z) TAR_OPT="Z" ;; > - *.db.tar) TAR_OPT="" ;; > + case $1 in > + *.db.tar.*|*.db.tar) ;;
I'd like to see a "can_compress_as" function added so that we can actually test if the extension is recognized. We could also use this to check PKGEXT/SRCEXT rather than falling back to plain tar. Allan
