Skip to content

Commit c2bc221

Browse files
keithc-cakeithc-ca
committed
Getting sources should stop on the first error
to avoid attempting builds with the wrong code * improve bash version check * more careful use of quotes * simpler handling of defaults * remove --revision option (mercurial) * don't print usage when encountering the '--' option Signed-off-by: Keith W. Campbell <[email protected]>
1 parent 3f2a4ea commit c2bc221

File tree

2 files changed

+69
-78
lines changed

2 files changed

+69
-78
lines changed

‎closed/get_j9_source.sh

+63-74
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

33
# ===========================================================================
44
# (c) Copyright IBM Corp. 2017 All Rights Reserved
55
# ===========================================================================
6-
#
6+
#
77
# This code is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU General Public License version 2 only, as
9-
# published by the Free Software Foundation.
9+
# published by the Free Software Foundation.
1010
#
1111
# This code is distributed in the hope that it will be useful, but WITHOUT
1212
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -16,9 +16,12 @@
1616
#
1717
# You should have received a copy of the GNU General Public License version
1818
# 2 along with this work; if not, see <http://www.gnu.org/licenses/>.
19-
#
19+
#
2020
# ===========================================================================
21-
21+
22+
# exit immediately if any unexpected error occurs
23+
set -e
24+
2225
usage() {
2326
echo "Usage: $0 [-h|--help] [-openj9-repo=<j9vm repo url>] [-openj9-branch=<branch>] [-openj9-sha=<commit sha>] [... other OpenJ9 repositories and branches options] [-parallel=<true|false>]"
2427
echo "where:"
@@ -30,144 +33,130 @@ usage() {
3033
echo " -omr-repo the OpenJ9/omr repository url: https://github.com/eclipse/openj9-omr.git"
3134
echo " or [email protected]:<namespace>/openj9-omr.git"
3235
echo " -omr-branch the OpenJ9/omr git branch: openj9"
33-
echo " -omr-sha a commit SHA for the omr repository"
36+
echo " -omr-sha a commit SHA for the omr repository"
3437
echo " -parallel (boolean) if 'true' then the clone j9 repository commands run in parallel, default is false"
3538
echo ""
3639
exit 1
3740
}
3841

3942
# require bash 4.0 or later to support associative arrays
40-
bash_version=`bash --version | sed -n 1p`
41-
if [[ $bash_version != *"version 4."* ]] ; then
43+
if [ "0${BASH_VERSINFO[0]}" -lt 4 ] ; then
4244
echo "Bash version 4.0 or later is required!"
4345
exit 1
4446
fi
4547

46-
declare -A j9repos
4748
declare -A branches
48-
declare -A default_j9repos=( [openj9]=eclipse/openj9 [omr]=eclipse/openj9-omr )
49-
declare -A default_branches=( [openj9]=master [omr]=openj9 )
5049
declare -A commands
50+
declare -A git_urls
5151
declare -A shas
5252

53-
pflag="false"
54-
base_git_url=https://github.com
53+
git_urls[openj9]=https://github.com/eclipse/openj9
54+
branches[openj9]=master
55+
56+
git_urls[omr]=https://github.com/eclipse/openj9-omr
57+
branches[omr]=openj9
58+
59+
pflag=false
5560

56-
for i in "$@"
57-
do
61+
for i in "$@" ; do
5862
case $i in
5963
-h | --help )
60-
usage
61-
;;
62-
63-
-r=* | --revision=* )
64-
hgtag="${i#*=}"
65-
;;
64+
usage
65+
;;
6666

6767
-openj9-repo=* )
68-
j9repos[openj9]="${i#*=}"
69-
;;
68+
git_urls[openj9]="${i#*=}"
69+
;;
7070

7171
-openj9-branch=* )
72-
branches[openj9]="${i#*=}"
73-
;;
72+
branches[openj9]="${i#*=}"
73+
;;
7474

7575
-openj9-sha=* )
76-
shas[openj9]="${i#*=}"
77-
;;
76+
shas[openj9]="${i#*=}"
77+
;;
7878

7979
-omr-repo=* )
80-
j9repos[omr]="${i#*=}"
81-
;;
80+
git_urls[omr]="${i#*=}"
81+
;;
8282

8383
-omr-branch=* )
84-
branches[omr]="${i#*=}"
85-
;;
84+
branches[omr]="${i#*=}"
85+
;;
8686

8787
-omr-sha=* )
88-
shas[omr]="${i#*=}"
89-
;;
88+
shas[omr]="${i#*=}"
89+
;;
9090

9191
-parallel=* )
92-
pflag="${i#*=}"
93-
;;
92+
pflag="${i#*=}"
93+
;;
9494

9595
'--' ) # no more options
96-
usage
97-
;;
96+
break
97+
;;
9898

9999
-*) # bad option
100-
usage
101-
;;
100+
usage
101+
;;
102102

103103
*) # bad option
104-
usage
105-
;;
104+
usage
105+
;;
106106
esac
107107
done
108108

109-
git=`which git`
110-
111109
# clone OpenJ9 repos
112110
date '+[%F %T] Get OpenJ9 sources'
113111
START_TIME=$(date +%s)
114112

115-
for i in "${!default_j9repos[@]}" ; do
116-
branch=${default_branches[$i]}
117-
if [ ${branches[$i]+_} ]; then
118-
branch=${branches[$i]}
119-
fi
113+
for i in "${!git_urls[@]}" ; do
114+
branch=${branches[$i]}
120115

121-
if [ -d ${i} ]; then
116+
if [ -d ${i} ] ; then
122117
echo
123118
echo "Update ${i} source"
124119
echo
125120

126121
cd ${i}
127-
git pull --rebase origin ${branch} || exit $?
122+
git pull --rebase origin ${branch}
128123

129-
if [ -f .gitmodules ]; then
130-
git pull --rebase --recurse-submodules=yes || exit $?
131-
git submodule update --rebase --recursive || exit $?
124+
if [ -f .gitmodules ] ; then
125+
git pull --rebase --recurse-submodules=yes
126+
git submodule update --rebase --recursive
132127
fi
133-
cd -
128+
cd - > /dev/null
134129
else
135-
git_url=${base_git_url}/${default_j9repos[$i]}
136-
137-
if [ ${j9repos[$i]+_} ]; then
138-
git_url="${j9repos[$i]}"
139-
fi
140-
141-
git_clone_command="${git} clone --recursive -b ${branch} ${git_url} ${i}"
142-
commands[$i]=${git_clone_command}
130+
git_clone_command="git clone --recursive -b ${branch} ${git_urls[$i]} ${i}"
131+
commands[$i]=$git_clone_command
143132

144133
echo
145134
echo "Clone repository: ${i}"
146135
echo
147136

148-
if [ ${pflag} = "true" ] ; then
137+
if [ ${pflag} = true ] ; then
149138
# run git clone in parallel
150-
( ${git_clone_command} ; echo "$?" > /tmp/${i}.pid.rc ) 2>&1 &
139+
( if $git_clone_command ; then echo 0 ; else echo $? ; fi ) > /tmp/${i}.pid.rc 2>&1 &
151140
else
152-
${git_clone_command} || exit $?
141+
$git_clone_command
153142
fi
154143
fi
155144
done
156145

157-
if [ ${pflag} = "true" ] ; then
158-
# Wait for all subprocesses to complete
146+
if [ ${pflag} = true ] ; then
147+
# wait for all subprocesses to complete
159148
wait
160149
fi
161150

162151
END_TIME=$(date +%s)
163152
date "+[%F %T] OpenJ9 clone repositories finished in $(($END_TIME - $START_TIME)) seconds"
164153

165-
for i in "${!default_j9repos[@]}" ; do
166-
if [ -e /tmp/${i}.pid.rc ]; then
154+
for i in "${!git_urls[@]}" ; do
155+
if [ -e /tmp/${i}.pid.rc ] ; then
167156
# check if the git clone repository command failed
168-
rc=`cat /tmp/${i}.pid.rc | tr -d ' \n\r'`
157+
rc=$(cat /tmp/${i}.pid.rc | tr -d ' \n\r')
169158

170-
if [ "$rc" -ne "0" ]; then
159+
if [ "$rc" != 0 ] ; then
171160
echo "ERROR: repository ${i} exited abnormally!"
172161
cat /tmp/${i}.pid.rc
173162
echo "Re-run: ${commands[$i]}"
@@ -183,13 +172,13 @@ for i in "${!default_j9repos[@]}" ; do
183172
fi
184173
fi
185174

186-
if [ ${shas[$i]+_} ]; then
175+
if [ "x${shas[$i]}" != x ] ; then
187176
echo
188177
echo "Update ${i} to commit ID: ${shas[$i]}"
189178
echo
190179

191180
cd ${i}
192-
git checkout ${shas[$i]} || exit $?
193-
cd -
181+
git checkout ${shas[$i]}
182+
cd - > /dev/null
194183
fi
195184
done

‎get_source.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

33
#
44
# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -25,6 +25,9 @@
2525
# questions.
2626
#
2727

28+
# exit immediately if any unexpected error occurs
29+
set -e
30+
2831
usage() {
2932
echo "Usage: $0 [-h|--help] [... other j9 options] [-parallel=<true|false>]"
3033
echo "where:"
@@ -37,9 +40,9 @@ usage() {
3740
echo " -omr-repo the OpenJ9/omr repository url: https://github.com/eclipse/openj9-omr.git"
3841
echo " or [email protected]:<namespace>/openj9-omr.git"
3942
echo " -omr-branch the OpenJ9/omr git branch: openj9"
40-
echo " -omr-sha a commit SHA for the omr repository"
43+
echo " -omr-sha a commit SHA for the omr repository"
4144
echo " -parallel (boolean) if 'true' then the clone j9 repository commands run in parallel, default is false"
42-
echo " "
45+
echo ""
4346
exit 1
4447
}
4548

@@ -71,4 +74,3 @@ done
7174

7275
# Get clones of OpenJ9 absent repositories
7376
bash closed/get_j9_source.sh ${j9options}
74-

0 commit comments

Comments
 (0)