[arch-projects] [devtools] [PATCH 1/2] find-libdeps: cleanup some quoting/array concerns
--- find-libdeps.in | 14 +++++++------- 1 file 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 -- 2.1.2
bsdtar doesn't consider it an error when your --include doesn't match anything in the archive, so we're forced to dump stderr to /dev/null here. Fixes: https://bugs.archlinux.org/task/42551 --- checkpkg.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checkpkg.in b/checkpkg.in index 6ba04ed..467ac74 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -63,8 +63,8 @@ for _pkgname in "${pkgname[@]}"; do sdiff -s "$TEMPDIR/filelist-$_pkgname-old" "$TEMPDIR/filelist-$_pkgname" - find-libprovides "$TEMPDIR/$oldpkg" | sort > "$TEMPDIR/libraries-$_pkgname-old" - find-libprovides "$pkgfile" | sort > "$TEMPDIR/libraries-$_pkgname" + find-libprovides "$TEMPDIR/$oldpkg" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname-old" + find-libprovides "$pkgfile" 2>/dev/null | sort > "$TEMPDIR/libraries-$_pkgname" if ! diff_output="$(sdiff -s "$TEMPDIR/libraries-$_pkgname-old" "$TEMPDIR/libraries-$_pkgname")"; then msg "Sonames differ in $_pkgname!" echo "$diff_output" -- 2.1.2
participants (1)
-
Dave Reisner