diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2013-09-04 00:12:53 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-09-18 06:28:03 +0200 |
| commit | de570d1a65a24dfc53797d4a53e2ff82ec814ab3 (patch) | |
| tree | 5218ff690e88810b774e2a3f804898f945ebeadc | |
| parent | 2091f7ab163926cdc6e6d5bfb1195ff36a6119a4 (diff) | |
| download | pacman-de570d1a65a24dfc53797d4a53e2ff82ec814ab3.tar.gz pacman-de570d1a65a24dfc53797d4a53e2ff82ec814ab3.tar.xz | |
makepkg: always use read's -r flag with filenames
These are all cases where we're reading filenames -- any backslashes
are intentional and should not be interpreted.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0825600f..44d5335b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1533,7 +1533,7 @@ strip_file() { objcopy --add-gnu-debuglink="$dbgdir/${binary#/}.debug" "$binary" # create any needed hardlinks - while read -d '' file ; do + while read -rd '' file ; do if [[ "${binary}" -ef "${file}" && ! -f "$dbgdir/${file}.debug" ]]; then mkdir -p "$dbgdir/${file%/*}" ln "$dbgdir/${binary}.debug" "$dbgdir/${file}.debug" @@ -1615,7 +1615,7 @@ tidy_install() { while read -rd ' ' inode; do read file find ${MAN_DIRS[@]} -type l 2>/dev/null | - while read link ; do + while read -r link ; do if [[ "${file}" -ef "${link}" ]] ; then rm -f "$link" "${link}.gz" if [[ ${file%/*} = ${link%/*} ]]; then @@ -1649,7 +1649,7 @@ tidy_install() { fi local binary strip_flags - find . -type f -perm -u+w -print0 2>/dev/null | while read -d '' binary ; do + find . -type f -perm -u+w -print0 2>/dev/null | while read -rd '' binary ; do case "$(file -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) strip_flags="$STRIP_SHARED";; @@ -1667,7 +1667,7 @@ tidy_install() { if check_option "upx" "y"; then msg2 "$(gettext "Compressing binaries with %s...")" "UPX" local binary - find . -type f -perm -u+w 2>/dev/null | while read binary ; do + find . -type f -perm -u+w 2>/dev/null | while read -r binary ; do if [[ $(file -bi "$binary") = *'application/x-executable'* ]]; then upx $UPXFLAGS "$binary" &>/dev/null || warning "$(gettext "Could not compress binary : %s")" "${binary/$pkgdir\//}" @@ -1695,7 +1695,7 @@ find_libdepends() { local libdeps filename soarch sofile soname soversion; declare -A libdeps; - while read filename; do + while read -r filename; do # get architecture of the file; if soarch is empty it's not an ELF binary soarch=$(LC_ALL=C readelf -h "$filename" 2>/dev/null | sed -n 's/.*Class.*ELF\(32\|64\)/\1/p') [[ -n "$soarch" ]] || continue |