diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-01 14:57:52 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-01 14:57:52 -0500 |
commit | 5f4e575914fd597d31e5b9edd203eb6a8aa1306a (patch) | |
tree | df0a69e028562bf61e05d4a7b94de7379758ef57 /find-libdeps.in | |
parent | 34ac2931234b898d587bffe76ba061082b6c673c (diff) | |
parent | db135e90137c5ebb9248ae7bd5ced4e8ee6b27da (diff) |
Merge branch 'archlinux'libretools-20150104
Diffstat (limited to 'find-libdeps.in')
-rw-r--r-- | find-libdeps.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/find-libdeps.in b/find-libdeps.in index c9b451e..b40f794 100644 --- a/find-libdeps.in +++ b/find-libdeps.in @@ -32,11 +32,11 @@ else setup_workdir case ${script_mode} in - deps) bsdtar -C $WORKDIR -xf "$1";; - provides) bsdtar -C $WORKDIR -xf "$1" --include="*.so*";; + deps) bsdtar -C "$WORKDIR" -xf "$1";; + provides) bsdtar -C "$WORKDIR" -xf "$1" --include="*.so*";; esac - pushd $WORKDIR >/dev/null + pushd "$WORKDIR" >/dev/null fi process_sofile() { @@ -50,16 +50,16 @@ process_sofile() { if ! in_array "${soname}=${soversion}-${soarch}" ${soobjects[@]}; then # libfoo.so=1-64 echo "${soname}=${soversion}-${soarch}" - soobjects=(${soobjects[@]} "${soname}=${soversion}-${soarch}") + soobjects+=("${soname}=${soversion}-${soarch}") fi } case $script_mode in - deps) find_args="-perm -u+x";; - provides) find_args="-name *.so*";; + deps) find_args=(-perm -u+x);; + provides) find_args=(-name '*.so*');; esac -find . -type f $find_args | while read filename; do +find . -type f "${find_args[@]}" | while read filename; do if [[ $script_mode = "provides" ]]; then # ignore if we don't have a shared object if ! LC_ALL=C readelf -h "$filename" 2>/dev/null | grep -q '.*Type:.*DYN (Shared object file).*'; then |