bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

repo-add: use more libmakepkg to handle common compression routines

Browse source 
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.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Eli Schwartz 2020-08-05 10:02:10 -04:00 • committed by Allan McRae
parent 74aacf4495
commit 2403fc9732
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
scripts/repo-add.sh.in
View file

@ -44,6 +44,7 @@ USE_COLOR='y'
PREVENT_DOWNGRADE=0 PREVENT_DOWNGRADE=0
# Import libmakepkg # Import libmakepkg
source "$LIBRARY"/util/compress.sh
source "$LIBRARY"/util/message.sh source "$LIBRARY"/util/message.sh
# ensure we have a sane umask set # ensure we have a sane umask set
@ -189,21 +190,13 @@ verify_signature() {
} }
verify_repo_extension() { verify_repo_extension() {
local repofile=$1 local junk=()
if [[ $1 = *.db.tar* ]] && get_compression_command "$1" junk; then
return 0
fi
case $repofile in error "$(gettext "'%s' does not have a valid database archive extension.")" "$1"
*.db.tar.gz) TAR_OPT="-z" ;; exit 1
*.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="" ;;
*) error "$(gettext "'%s' does not have a valid database archive extension.")" \
"$repofile"
exit 1 ;;
esac
printf '%s' "$TAR_OPT"
} }
# write an entry to the pacman database # write an entry to the pacman database
@ -522,7 +515,6 @@ rotate_db() {
} }
create_db() { create_db() {
TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE")
# $LOCKFILE is already guaranteed to be absolute so this is safe # $LOCKFILE is already guaranteed to be absolute so this is safe
dirname=${LOCKFILE%/*} dirname=${LOCKFILE%/*}
@ -532,13 +524,13 @@ create_db() {
tempname=$dirname/.tmp.$filename tempname=$dirname/.tmp.$filename
pushd "$tmpdir/$repo" >/dev/null pushd "$tmpdir/$repo" >/dev/null
if ( shopt -s nullglob; files=(*); (( ${#files[*]} )) ); then local files=(*)
bsdtar -c ${TAR_OPT} -f "$tempname" * if [[ ${files[*]} = '*' ]]; then
else
# we have no packages remaining? zip up some emptyness # we have no packages remaining? zip up some emptyness
warning "$(gettext "No packages remain, creating empty database.")" warning "$(gettext "No packages remain, creating empty database.")"
bsdtar -c ${TAR_OPT} -f "$tempname" -T /dev/null files=(-T /dev/null)
fi fi
bsdtar -cf - "${files[@]}" | compress_as "$filename" > "$tempname"
popd >/dev/null popd >/dev/null
create_signature "$tempname" create_signature "$tempname"
@ -656,7 +648,7 @@ else
LOCKFILE=$PWD/$REPO_DB_FILE.lck LOCKFILE=$PWD/$REPO_DB_FILE.lck
fi fi
verify_repo_extension "$REPO_DB_FILE" >/dev/null verify_repo_extension "$REPO_DB_FILE"
REPO_DB_PREFIX=${REPO_DB_FILE##*/} REPO_DB_PREFIX=${REPO_DB_FILE##*/}
REPO_DB_PREFIX=${REPO_DB_PREFIX%.db.*} REPO_DB_PREFIX=${REPO_DB_PREFIX%.db.*}