sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

third_party: Reformat shell scripts

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
third_party/update.sh vendored
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"

39
third_party/waf/update.sh vendored
View File

@ -1,8 +1,8 @@
#!/bin/bash
if [[ $# -lt 1 ]]; then
echo "Usage: update.sh VERSION"
exit 1
echo "Usage: update.sh VERSION"
exit 1
fi
WAF_VERSION="${1}"
@ -16,19 +16,21 @@ echo "GIT URL: ${WAF_GIT}"
echo "WAF SAMBA DIR: ${WAF_SAMBA_DIR}"
echo "WAF TMP DIR: ${WAF_TMPDIR}"
cleanup_tmpdir() {
popd 2>/dev/null || true
rm -rf "$WAF_TMPDIR"
cleanup_tmpdir()
{
popd 2>/dev/null || true
rm -rf "$WAF_TMPDIR"
}
trap cleanup_tmpdir SIGINT
cleanup_and_exit() {
cleanup_tmpdir
if test "$1" = 0 -o -z "$1" ; then
exit 0
else
exit "$1"
fi
cleanup_and_exit()
{
cleanup_tmpdir
if test "$1" = 0 -o -z "$1"; then
exit 0
else
exit "$1"
fi
}
# Checkout the git tree
@ -38,17 +40,16 @@ pushd "${WAF_TMPDIR}" || cleanup_and_exit 1
git clone "${WAF_GIT}"
ret=$?
if [ $ret -ne 0 ]; then
echo "ERROR: Failed to clone repository"
cleanup_and_exit 1
echo "ERROR: Failed to clone repository"
cleanup_and_exit 1
fi
pushd waf || cleanup_and_exit 1
git checkout -b "waf-${WAF_VERSION}" "waf-${WAF_VERSION}"
ret=$?
if [ $ret -ne 0 ]; then
echo "ERROR: Failed to checkout waf-${WAF_VERSION} repository"
cleanup_and_exit 1
echo "ERROR: Failed to checkout waf-${WAF_VERSION} repository"
cleanup_and_exit 1
fi
popd || cleanup_and_exit 1
@ -62,8 +63,8 @@ rm -rf waflib/
rsync -av "${WAF_TMPDIR}/waf/waflib" .
ret=$?
if [ $ret -ne 0 ]; then
echo "ERROR: Failed copy waflib"
cleanup_and_exit 1
echo "ERROR: Failed copy waflib"
cleanup_and_exit 1
fi
chmod -x waflib/Context.py