From 67bd3f0ec065dbb60a2ffd7eb47ff26a2c54f222 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Sat, 28 Apr 2012 19:31:45 -0700 Subject: [PATCH] Add x32 support --- perl-cleaner | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/perl-cleaner b/perl-cleaner index fbf5ae1..3534016 100755 --- a/perl-cleaner +++ b/perl-cleaner @@ -87,7 +87,7 @@ ph_clean() { veinfo 1 "Locating ph files for removal" eindent "" - for i in /usr/lib64/perl5 /usr/lib/perl5 ; do + for i in /usr/lib{,64,x32}/perl5 ; do [[ ! -d ${i} ]] && continue veinfo 4 "...in ${i}" while IFS= read -r -d $'\0' file ; do @@ -214,7 +214,7 @@ update_packages(){ while read -r type file ; do shopt -s extglob [[ ${type} == obj ]] || [[ ${type} == sym ]] || continue - [[ ${file} =~ ^/usr/(share|lib(32|64)?)/perl5 ]] || continue + [[ ${file} =~ ^/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue file=${file% +(!([[:space:]])) +([[:digit:]])} shopt -u extglob if ${FORCE} || outdated_path "${file}" ; then @@ -248,7 +248,7 @@ update_packages(){ if ${LIBPERL} ; then # We assume the broken libs have all bin or lib in their path - broken_libs="$(scanelf -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.so\.[0-9.]*' | sort -u )" + broken_libs="$(scanelf -qBn < <(awk '/^(obj|sym) [^]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.so\.[0-9.]*' | sort -u )" if [[ -n "${broken_libs}" ]] ; then if ${FORCE} || [[ ${broken_libs} != ${SONAME} ]] ; then PKGS_TO_REMERGE+=" ${CATPKGVER}" @@ -315,7 +315,7 @@ leftovers() { veinfo 1 "or edited. This script cannot deal with them." vecho 1 - for i in /usr/{share,lib{,32,64}}/perl5 ; do + for i in /usr/{share,lib{,32,64,x32}}/perl5 ; do [[ -d $i ]] && perlpath[${#perlpath[*]}]="$(realpath $i 2>/dev/null )" done [[ ${#perlpath[*]} == 0 ]] && return -- 1.7.8.5