1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00

third_party: Reformat shell scripts

shfmt -w -p -i 0 -fn third_party/update.sh
shfmt -w -p -i 0 -fn third_party/waf/update.sh

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>

Autobuild-User(master): Pavel Filipensky <pfilipensky@samba.org>
Autobuild-Date(master): Wed Aug 10 14:14:04 UTC 2022 on sn-devel-184
This commit is contained in:
Andreas Schneider 2022-02-23 12:11:07 +01:00 committed by Pavel Filipensky
parent bb2e0622f0
commit 042141efdb
2 changed files with 22 additions and 21 deletions

View File

@ -3,10 +3,10 @@
# our source tree for users that don't have them installed on their system
# Third party directory
THIRD_PARTY_DIR="`dirname $0`"
THIRD_PARTY_DIR="$(dirname $0)"
# Library directory where projects live that haven't been migrated to
# $THIRD_PARTY_DIR yet.
WORKDIR="`mktemp -d`"
WORKDIR="$(mktemp -d)"
echo "Updating zlib..."
git clone git://git.samba.org/third_party/zlib "$WORKDIR/zlib"

View File

@ -16,13 +16,15 @@ echo "GIT URL: ${WAF_GIT}"
echo "WAF SAMBA DIR: ${WAF_SAMBA_DIR}"
echo "WAF TMP DIR: ${WAF_TMPDIR}"
cleanup_tmpdir() {
cleanup_tmpdir()
{
popd 2>/dev/null || true
rm -rf "$WAF_TMPDIR"
}
trap cleanup_tmpdir SIGINT
cleanup_and_exit() {
cleanup_and_exit()
{
cleanup_tmpdir
if test "$1" = 0 -o -z "$1"; then
exit 0
@ -42,7 +44,6 @@ if [ $ret -ne 0 ]; then
cleanup_and_exit 1
fi
pushd waf || cleanup_and_exit 1
git checkout -b "waf-${WAF_VERSION}" "waf-${WAF_VERSION}"
ret=$?