[tor-commits] [tor/main] Update combine_libs script

[nickm at torproject.org]

commit 719169dbe374b85b30e8ab2493c43ab4e747302f
Author: skaluzka <skaluzka at protonmail.com>
Date:   Sat Aug 14 21:45:44 2021 +0200

    Update combine_libs script
    
    Remove commented code from production.
    Align indentations to 4 spaces.
---
 scripts/build/combine_libs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/build/combine_libs b/scripts/build/combine_libs
index 9c87f68248..a855171dc7 100755
--- 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"