diff options
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make-dist b/make-dist index e874436a5e7..64ceef20d5e 100755 --- a/make-dist +++ b/make-dist @@ -23,7 +23,7 @@ version=$1 [ -z "$version" ] && version=$(git describe --long --match 'v*' | sed 's/^v//') if expr index $version '-' > /dev/null; then rpm_version=$(echo $version | cut -d - -f 1-1) - rpm_release=$(echo $version | cut -d - -f 2- | sed 's/-/./') + rpm_release=$(echo $version | cut -d - -f 2- | sed 's/-/./g') else rpm_version=$version rpm_release=0 @@ -35,7 +35,8 @@ echo "version $version" # update submodules echo "updating submodules..." force=$(if git submodule usage 2>&1 | grep --quiet 'update.*--force'; then echo --force ; fi) -if ! git submodule sync || ! git submodule update $force --init --recursive --progress; then +quiet_or_progress=$(if test -n "$JENKINS_URL"; then echo --quiet; else echo --progress; fi) +if ! git submodule sync || ! git submodule update $force --init --recursive $quiet_or_progress; then echo "Error: could not initialize submodule projects" echo " Network connectivity might be required." exit 1 |