Skip to content

Commit 225898f

Browse files
authored
prepare-results: formatted script with shfmt
1 parent d54d8e7 commit 225898f

File tree

1 file changed

+40
-39
lines changed

1 file changed

+40
-39
lines changed

build-scripts/prepare-results

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
. `dirname "$0"`/functions
3+
. $(dirname "$0")/functions
44
. detect-environment
55
. compile-options
66
. version
@@ -10,44 +10,45 @@ set -x
1010
mkdir -p "$OUTDIR"
1111

1212
for dir in cfengine-community cfengine-nova cfengine-nova-hub; do
13-
if [ -d $BASEDIR/$dir ]; then
14-
case "$PACKAGING" in
15-
rpm)
16-
cp $BASEDIR/$dir/RPMS/*/*.rpm "$OUTDIR"
17-
cp $BASEDIR/$dir/RPMS/*.pkg.tar.gz "$OUTDIR"
18-
;;
19-
deb)
20-
cp $BASEDIR/$dir/*.deb "$OUTDIR"
21-
cp $BASEDIR/$dir/pkg/*.pkg.tar.gz "$OUTDIR"
22-
;;
23-
msi)
24-
cp $BASEDIR/$dir/*.msi "$OUTDIR"
25-
;;
26-
solaris)
27-
cp $BASEDIR/$dir/*.pkg "$OUTDIR"
28-
;;
29-
freebsd)
30-
cp build/$dir/pkg/*.tbz "$OUTDIR"
31-
;;
32-
hpux)
33-
cp $BASEDIR/$dir/pkg/*.depot "$OUTDIR"
34-
;;
35-
lpp)
36-
cp $BASEDIR/$dir/RPMS/*/*.rpm "$OUTDIR"
37-
cp $HOME/lppdir/out/*.bff "$OUTDIR"
38-
;;
39-
*)
40-
echo "Unknown packaging system: $PACKAGING"
41-
exit 1;;
42-
esac
43-
#cp $BASEDIR/$dir/*.generic-pkg.tar.gz "$OUTDIR"
44-
fi
13+
if [ -d $BASEDIR/$dir ]; then
14+
case "$PACKAGING" in
15+
rpm)
16+
cp $BASEDIR/$dir/RPMS/*/*.rpm "$OUTDIR"
17+
cp $BASEDIR/$dir/RPMS/*.pkg.tar.gz "$OUTDIR"
18+
;;
19+
deb)
20+
cp $BASEDIR/$dir/*.deb "$OUTDIR"
21+
cp $BASEDIR/$dir/pkg/*.pkg.tar.gz "$OUTDIR"
22+
;;
23+
msi)
24+
cp $BASEDIR/$dir/*.msi "$OUTDIR"
25+
;;
26+
solaris)
27+
cp $BASEDIR/$dir/*.pkg "$OUTDIR"
28+
;;
29+
freebsd)
30+
cp build/$dir/pkg/*.tbz "$OUTDIR"
31+
;;
32+
hpux)
33+
cp $BASEDIR/$dir/pkg/*.depot "$OUTDIR"
34+
;;
35+
lpp)
36+
cp $BASEDIR/$dir/RPMS/*/*.rpm "$OUTDIR"
37+
cp $HOME/lppdir/out/*.bff "$OUTDIR"
38+
;;
39+
*)
40+
echo "Unknown packaging system: $PACKAGING"
41+
exit 1
42+
;;
43+
esac
44+
#cp $BASEDIR/$dir/*.generic-pkg.tar.gz "$OUTDIR"
45+
fi
4546
done
4647

47-
for project in `projects_to_test`; do
48-
if [ -f $BASEDIR/$project/tests/acceptance/summary.log ]; then
49-
cp $BASEDIR/$project/tests/acceptance/summary.log "$OUTDIR"/$project-summary.log
50-
cp $BASEDIR/$project/tests/acceptance/test.log "$OUTDIR"/$project-test.log
51-
cp $BASEDIR/$project/tests/acceptance/test.xml "$OUTDIR"/$project-test.xml
52-
fi
48+
for project in $(projects_to_test); do
49+
if [ -f $BASEDIR/$project/tests/acceptance/summary.log ]; then
50+
cp $BASEDIR/$project/tests/acceptance/summary.log "$OUTDIR"/$project-summary.log
51+
cp $BASEDIR/$project/tests/acceptance/test.log "$OUTDIR"/$project-test.log
52+
cp $BASEDIR/$project/tests/acceptance/test.xml "$OUTDIR"/$project-test.xml
53+
fi
5354
done

0 commit comments

Comments
 (0)