tor

commit 00b57e81f827d524dc42e2eab052e4d3b61b2cb6
parent 03a709ead1368e3033fdf9933243945e46a65f0b
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 18 Aug 2021 08:39:50 -0400

Merge remote-tracking branch 'tor-gitlab/mr/419'

Diffstat:
M
scripts/build/combine_libs
 | 
9
++-------

1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/scripts/build/combine_libs b/scripts/build/combine_libs
@@ -8,15 +8,11 @@ ORIGDIR="$(pwd)"
 trap 'cd "$ORIGDIR" && rm -rf "$TMPDIR"' 0
 
 abspath() {
-          echo "$(cd "$(dirname "$1")">/dev/null && pwd)/$(basename "$1")"
+    echo "$(cd "$(dirname "$1")" >/dev/null && pwd)/$(basename "$1")"
 }
 
 TARGET=$(abspath "$1")
 
-#echo ORIGDIR="$ORIGDIR"
-#echo AR="$AR"
-#echo ARFLAGS="$AFLAGS"
-
 shift
 
 for input in "$@"; do
@@ -24,12 +20,11 @@ for input in "$@"; do
     abs=$(abspath "$input")
     dir="$TMPDIR"/$(basename "$input" .a)
     mkdir "$dir"
-    cd "$dir">/dev/null
+    cd "$dir" >/dev/null
     "${AR:-ar}" x "$abs"
 done
 
 cd "$TMPDIR" >/dev/null
-#echo "${AR:-ar}" "${ARFLAGS:-cru}" library.tmp.a ./*/**
 "${AR:-ar}" "${ARFLAGS:-cru}" library.tmp.a ./*/**
 "${RANLIB:-ranlib}" library.tmp.a
 mv -f library.tmp.a "$TARGET"