diff options
| author | Chirantan Ekbote <chirantan.ekbote@gmail.com> | 2013-01-29 03:14:02 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-01-29 04:37:25 +0100 |
| commit | 266b3dd70698db05cd2e531fdcf2c5c2a741e3cb (patch) | |
| tree | 0acd139d98f919dc169449702340ed6fd2e5cc39 | |
| parent | 27067b137286a40c47ae48bf6f296caf14688cd3 (diff) | |
| download | pacman-266b3dd70698db05cd2e531fdcf2c5c2a741e3cb.tar.gz pacman-266b3dd70698db05cd2e531fdcf2c5c2a741e3cb.tar.xz | |
makepkg: Integrate check_install into tidy_install
Rearrange tidy_install so we first remove docs, unwanted files,
libtool files, and empty directories. Then check for missing backup
files and references to $srcdir and $pkgdir. Finally compress manpages,
strip debug symbols, and compress executables with upx.
Fixes FS33318
Signed-off-by: Chirantan Ekbote <chirantan.ekbote@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 59 |
1 files changed, 26 insertions, 33 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index dcd920d1..bcc415b8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1497,6 +1497,32 @@ tidy_install() { done fi + if check_option "libtool" "n"; then + msg2 "$(gettext "Removing "%s" files...")" "libtool" + find . ! -type d -name "*.la" -exec rm -f -- '{}' \; + fi + + if check_option "emptydirs" "n"; then + msg2 "$(gettext "Removing empty directories...")" + find . -depth -type d -exec rmdir '{}' + 2>/dev/null + fi + + # check existence of backup files + local file + for file in "${backup[@]}"; do + if [[ ! -f $file ]]; then + warning "$(gettext "%s entry file not in package : %s")" "backup" "$file" + fi + done + + # check for references to the build and package directory + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then + warning "$(gettext "Package contains reference to %s")" "\$srcdir" + fi + if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdir}" ; then + warning "$(gettext "Package contains reference to %s")" "\$pkgdir" + fi + if check_option "zipman" "y" && [[ -n ${MAN_DIRS[*]} ]]; then msg2 "$(gettext "Compressing man and info pages...")" local file files inode link @@ -1552,16 +1578,6 @@ tidy_install() { done fi - if check_option "libtool" "n"; then - msg2 "$(gettext "Removing "%s" files...")" "libtool" - find . ! -type d -name "*.la" -exec rm -f -- '{}' \; - fi - - if check_option "emptydirs" "n"; then - msg2 "$(gettext "Removing empty directories...")" - find . -depth -type d -exec rmdir '{}' + 2>/dev/null - fi - if check_option "upx" "y"; then msg2 "$(gettext "Compressing binaries with %s...")" "UPX" local binary @@ -1753,27 +1769,6 @@ write_pkginfo() { check_license } -check_package() { - cd_safe "$pkgdir" - - # check existence of backup files - local file - for file in "${backup[@]}"; do - if [[ ! -f $file ]]; then - warning "$(gettext "%s entry file not in package : %s")" "backup" "$file" - fi - done - - # check for references to the build and package directory - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${srcdir}" ; then - warning "$(gettext "Package contains reference to %s")" "\$srcdir" - fi - if find "${pkgdir}" -type f -print0 | xargs -0 grep -q -I "${pkgdir}" ; then - warning "$(gettext "Package contains reference to %s")" "\$pkgdir" - fi - -} - create_package() { if [[ ! -d $pkgdir ]]; then error "$(gettext "Missing %s directory.")" "pkg/" @@ -1781,8 +1776,6 @@ create_package() { exit 1 # $E_MISSING_PKGDIR fi - check_package - cd_safe "$pkgdir" msg "$(gettext "Creating package \"%s\"...")" "$pkgname" |