diff options
| author | Allan McRae <allan@archlinux.org> | 2012-03-09 17:15:28 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-03-16 12:01:15 -0500 |
| commit | 44de3183ff42dc4e5972a9d563ebc7125c3eb4dd (patch) | |
| tree | 343c6d0d562a1f5bf1021dab4136df17a0cc9b96 | |
| parent | 03465ad6b6719e0afb20ca8829581190a2b7658e (diff) | |
| download | pacman-44de3183ff42dc4e5972a9d563ebc7125c3eb4dd.tar.xz | |
makepkg: prevent issues with files starting with a hyphen
Most places in makepkg deal with full file paths, but a few use the
file name only. Protect from potential issues when a file name
starts with a hyphen.
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8763ffba..2386a688 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -845,7 +845,7 @@ extract_sources() { if [[ $cmd = bsdtar ]]; then $cmd -xf "$file" || ret=$? else - rm -f "${file%.*}" + rm -f -- "${file%.*}" $cmd -dcf "$file" > "${file%.*}" || ret=$? fi if (( ret )); then @@ -974,7 +974,7 @@ tidy_install() { if [[ $(check_option docs) = "n" && -n ${DOC_DIRS[*]} ]]; then msg2 "$(gettext "Removing doc files...")" - rm -rf ${DOC_DIRS[@]} + rm -rf -- ${DOC_DIRS[@]} fi if [[ $(check_option purge) = "y" && -n ${PURGE_TARGETS[*]} ]]; then @@ -1001,7 +1001,7 @@ tidy_install() { find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | while read link ; do rm -f "$link" "${link}.gz" - ln -s "${file}.gz" "${link}.gz" + ln -s -- "${file}.gz" "${link}.gz" done # check file still exists (potentially already compressed due to hardlink) |