diff options
| author | Allan McRae <allan@archlinux.org> | 2015-01-27 02:10:45 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-02-01 12:17:14 +0100 |
| commit | 10fc538c70bf84f64881403f964ff4d6651268b3 (patch) | |
| tree | a30ba06039fd632e1d7586a0dcf5588dfd326ddb /scripts | |
| parent | 841e531c519228b68a447a61d703d21c5ff6d37f (diff) | |
| download | pacman-10fc538c70bf84f64881403f964ff4d6651268b3.tar.gz pacman-10fc538c70bf84f64881403f964ff4d6651268b3.tar.xz | |
makepkg: refix removing static libraries when shared uses absolute symlinks
Commit 9e5e86aa was supposed to fix this. Instead I picked another [[ -f ]]
statement in the same region and added the hardlink test to it instead, thus
not fixing the bug.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f30156a9..4461d12f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1818,7 +1818,7 @@ tidy_install() { msg2 "$(gettext "Removing static library files...")" local l while read -rd '' l; do - if [[ -f "${l%.a}.so" ]]; then + if [[ -f "${l%.a}.so" || -h "${l%.a}.so" ]]; then rm "$l" fi done < <(find . ! -type d -name "*.a" -print0) @@ -1832,7 +1832,7 @@ tidy_install() { # check existence of backup files local file for file in "${backup[@]}"; do - if [[ ! -f $file && ! -h $file ]]; then + if [[ ! -f $file ]]; then warning "$(gettext "%s entry file not in package : %s")" "backup" "$file" fi done |