Code Review
/
icn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Increase provisioning timeout for HA VM testing"
[icn.git]
/
tools
/
collect.sh
diff --git
a/tools/collect.sh
b/tools/collect.sh
index
e8a1bde
..
05450c2
100755
(executable)
--- a/
tools/collect.sh
+++ b/
tools/collect.sh
@@
-1,7
+1,5
@@
#!/usr/bin/env bash
#!/usr/bin/env bash
-
-
-set -ex
+set -eux -o pipefail
SCRIPT_PATH=`realpath $0`
TOOL_PATH=`dirname "$SCRIPT_PATH"`
SCRIPT_PATH=`realpath $0`
TOOL_PATH=`dirname "$SCRIPT_PATH"`
@@
-13,10
+11,9
@@
mkdir -p $ICN_PATH/apt/deb/
# Call scripts to collect everything from Internet,
# all the collected files need to be put under ICN_PATH
# Call scripts to collect everything from Internet,
# all the collected files need to be put under ICN_PATH
-for collect_sh in `find icn/ -name collect_*.sh | sort`
-do
- collect_parent=`dirname $collect_sh`
- pushd $collect_parent
+for collect_sh in `find icn/ -name collect_*.sh | sort`; do
+ collect_parent=`dirname $collect_sh`
+ pushd $collect_parent
bash `basename $collect_sh` $ICN_PATH
bash `basename $collect_sh` $ICN_PATH
- popd
+
popd
done
done