Skip to content

Commit 446377e

Browse files
authored
unpack-tarballs: formatted script with shfmt
1 parent 225898f commit 446377e

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

build-scripts/unpack-tarballs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#!/bin/sh -x
22

3-
. `dirname "$0"`/functions
3+
. $(dirname "$0")/functions
44
. detect-environment
55
. compile-options
66

7-
87
SOURCE_TARBALL="$BASEDIR/output/tarballs/cfengine-3.*.tar.gz"
9-
MASTERFILES_TARBALL=`ls $BASEDIR/output/tarballs/cfengine-masterfiles*.tar.gz | grep -v 'pkg.tar.gz$'`
8+
MASTERFILES_TARBALL=$(ls $BASEDIR/output/tarballs/cfengine-masterfiles*.tar.gz | grep -v 'pkg.tar.gz$')
109

1110
# DELETE the git-checked-out directories, they are tainted with
1211
# ./configure artifacts anyway. The tarballs are unpacked and symlinked
@@ -24,18 +23,17 @@ if [ -e "$BASEDIR/core/" ] || [ -e "$BASEDIR/masterfiles/" ]; then
2423
exit 1
2524
fi
2625

27-
if [ x$PROJECT = xcommunity ]
28-
then
26+
if [ x$PROJECT = xcommunity ]; then
2927
sudo rm -rf "$BASEDIR/enterprise" "$BASEDIR/nova" "$BASEDIR/mission-portal"
3028
fi
3129

3230
# NATIVE TAR is being used on purpose, and *not* GNU TAR.
3331

3432
echo "UNPACKING SOURCE TARBALL AND SYMLINKING core"
3533
cd $BASEDIR
36-
gzip -dc $SOURCE_TARBALL | tar -xf -
34+
gzip -dc $SOURCE_TARBALL | tar -xf -
3735
ln -s cfengine-3* core
3836

3937
echo "UNPACKING MASTERFILES TARBALL AND SYMLINKING masterfiles/"
40-
gzip -dc $MASTERFILES_TARBALL | tar -xf -
38+
gzip -dc $MASTERFILES_TARBALL | tar -xf -
4139
ln -s cfengine-masterfiles-* masterfiles

0 commit comments

Comments
 (0)