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

repo-add: enforce file extensions

Browse source 
Allow one of 4 archive extensions: .tar{,.gz,.xz,.bz2} for each of the 2
valid repo extensions: .db and .files. Check for this via
'verify_repo_extension' directly after option parsing to assert that
this extension is present, and again after files have been added to get
the proper archive option for bsdtar.

Signed-off-by: Dave Reisner <d@falconindy.com>
This commit is contained in:
Dave Reisner 2011-06-21 13:58:32 -04:00 • committed by Dave Reisner
parent 122b4c2187
commit 399184d68f
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -221,6 +221,22 @@ verify_signature() {
fi fi
} }
verify_repo_extension() {
local repofile=$1
case "$repofile" in
*.@(db|files).tar.gz) TAR_OPT="z" ;;
*.@(db|files).tar.bz2) TAR_OPT="j" ;;
*.@(db|files).tar.xz) TAR_OPT="J" ;;
*.@(db|files).tar) TAR_OPT="" ;;
*) error "$(gettext "'%s' does not have a valid archive extension.")" \
"$repofile"
exit 1 ;;
esac
printf '%s' "$TAR_OPT"
}
# write an entry to the pacman database # write an entry to the pacman database
# arg1 - path to package # arg1 - path to package
db_write_entry() { db_write_entry() {
@ -571,8 +587,11 @@ while (( $# )); do
shift shift
done done
REPO_DB_FILE=${args[0]} REPO_DB_FILE=${args[0]}
LOCKFILE=$REPO_DB_FILE.lck LOCKFILE=$REPO_DB_FILE.lck
verify_repo_extension "$REPO_DB_FILE" >/dev/null
check_repo_db check_repo_db
for arg in "${args[@]:1}"; do for arg in "${args[@]:1}"; do
@ -586,15 +605,7 @@ done
if (( success )); then if (( success )); then
msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE"
case "$REPO_DB_FILE" in TAR_OPT=$(verify_repo_extension "$REPO_DB_FILE")
*.tar.gz) TAR_OPT="z" ;;
*.tar.bz2) TAR_OPT="j" ;;
*.tar.xz) TAR_OPT="J" ;;
*.tar) TAR_OPT="" ;;
*) warning "$(gettext "'%s' does not have a valid archive extension.")" \
"$REPO_DB_FILE" ;;
esac
filename=${REPO_DB_FILE##*/} filename=${REPO_DB_FILE##*/}
pushd "$tmpdir" >/dev/null pushd "$tmpdir" >/dev/null