diff options
| author | Allan McRae <allan@archlinux.org> | 2015-02-01 21:18:31 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-02-01 21:18:31 +1000 |
| commit | 54c630f6ecd74a44cc84f6804e918bda61310eef (patch) | |
| tree | 974465cc870e9ce2a7e3ad61e14b2c5c66e6d34b /scripts | |
| parent | 5167160c0cd6007c0ed77534f02f78e5ad04e719 (diff) | |
| parent | 10fc538c70bf84f64881403f964ff4d6651268b3 (diff) | |
| download | pacman-54c630f6ecd74a44cc84f6804e918bda61310eef.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'scripts')
| -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 00beb76e..716ed808 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -605,7 +605,7 @@ extract_git() { exit 1 fi cd_safe "$srcdir" - elif ! git clone "$dir"; then + elif ! git clone "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 @@ -1819,7 +1819,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) @@ -1833,7 +1833,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 |