diff options
author | Andreas Schneider <asn@samba.org> | 2022-02-19 08:52:17 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2022-02-22 15:23:35 +0000 |
commit | 2d5d88ff34532ba2d78997467e5720bba480f07e (patch) | |
tree | 9ec6ba2ccfda4bf193d6e776b09623559ac6a3c3 /buildtools/scripts | |
parent | a9eebca923ae7461a94448d3f6800e36bbfc8e46 (diff) | |
download | samba-2d5d88ff34532ba2d78997467e5720bba480f07e.tar.gz |
buildtools: Reformat shell scripts
shfmt -f buildtools | xargs shfmt -w -p -i 0 -fn
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'buildtools/scripts')
-rwxr-xr-x | buildtools/scripts/abi_gen.sh | 22 | ||||
-rwxr-xr-x | buildtools/scripts/autogen-waf.sh | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/buildtools/scripts/abi_gen.sh b/buildtools/scripts/abi_gen.sh index ddb0a7cc36f..c66a1b848a8 100755 --- a/buildtools/scripts/abi_gen.sh +++ b/buildtools/scripts/abi_gen.sh @@ -6,21 +6,21 @@ SHAREDLIB="$1" GDBSCRIPT="gdb_syms.$$" ( -cat <<EOF + cat <<EOF set height 0 set width 0 EOF -# On older linker versions _init|_fini symbols are not hidden. -objdump --dynamic-syms "${SHAREDLIB}" | \ - awk '$0 !~ /.hidden/ {if ($2 == "g" && $3 ~ /D(F|O)/ && $4 ~ /(.bss|.rodata|.text)/) print $NF}' | \ - sort | \ - while read -r s; do - echo "echo $s: " - echo p "${s}" -done -) > $GDBSCRIPT + # On older linker versions _init|_fini symbols are not hidden. + objdump --dynamic-syms "${SHAREDLIB}" | + awk '$0 !~ /.hidden/ {if ($2 == "g" && $3 ~ /D(F|O)/ && $4 ~ /(.bss|.rodata|.text)/) print $NF}' | + sort | + while read -r s; do + echo "echo $s: " + echo p "${s}" + done +) >$GDBSCRIPT # forcing the terminal avoids a problem on Fedora12 -TERM=none gdb -n -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null +TERM=none gdb -n -batch -x $GDBSCRIPT "$SHAREDLIB" </dev/null rm -f $GDBSCRIPT diff --git a/buildtools/scripts/autogen-waf.sh b/buildtools/scripts/autogen-waf.sh index 7a6e94c5ec4..a0ed80c33fa 100755 --- a/buildtools/scripts/autogen-waf.sh +++ b/buildtools/scripts/autogen-waf.sh @@ -1,6 +1,6 @@ #!/bin/sh -p=`dirname $0` +p=$(dirname $0) echo "Setting up for waf build" @@ -13,12 +13,12 @@ echo "Found buildtools in $p/$d" echo "Setting up configure" rm -f $p/configure $p/include/config*.h* -sed "s|BUILDTOOLS|$d|g;s|BUILDPATH|$p|g" < "$p/$d/scripts/configure.waf" > $p/configure +sed "s|BUILDTOOLS|$d|g;s|BUILDPATH|$p|g" <"$p/$d/scripts/configure.waf" >$p/configure chmod +x $p/configure echo "Setting up Makefile" rm -f $p/makefile $p/Makefile -sed "s|BUILDTOOLS|$d|g" < "$p/$d/scripts/Makefile.waf" > $p/Makefile +sed "s|BUILDTOOLS|$d|g" <"$p/$d/scripts/Makefile.waf" >$p/Makefile echo "done. Now run $p/configure or $p/configure.developer then make." if [ $p != "." ]; then |