Skip to content
Snippets Groups Projects
Commit d158e210 authored by Tianon Gravi's avatar Tianon Gravi
Browse files

Adjust "update.sh" output to be more concise

parent 639f83fb
No related branches found
No related tags found
No related merge requests found
......@@ -40,8 +40,8 @@ for version in "${versions[@]}"; do
fullVersion="$(echo "$versionList" | awk -F ': ' '$1 == "Package" { pkg = $2 } $1 == "Version" && pkg == "postgresql-'"$version"'" { print $2; exit }' || true)"
majorVersion="${version%%.*}"
(
set -x
echo "$version: $fullVersion"
cp docker-entrypoint.sh "$version/"
sed -e 's/%%PG_MAJOR%%/'"$version"'/g;' \
-e 's/%%PG_VERSION%%/'"$fullVersion"'/g' \
......@@ -62,7 +62,6 @@ for version in "${versions[@]}"; do
# Provides: postgresql-contrib-10
sed -i -e '/postgresql-contrib-/d' "$version/Dockerfile"
fi
)
# TODO figure out what to do with odd version numbers here, like release candidates
srcVersion="${fullVersion%%-*}"
......@@ -74,8 +73,7 @@ for version in "${versions[@]}"; do
if [ ! -d "$version/$variant" ]; then
continue
fi
(
set -x
cp docker-entrypoint.sh "$version/$variant/"
sed -i 's/gosu/su-exec/g' "$version/$variant/docker-entrypoint.sh"
sed -e 's/%%PG_MAJOR%%/'"$version"'/g' \
......@@ -113,7 +111,7 @@ for version in "${versions[@]}"; do
;;
esac
sed -i 's/%%UUID_CONFIG_FLAG%%/'"$uuidConfigFlag"'/' "$version/$variant/Dockerfile"
)
travisEnv="\n - VERSION=$version VARIANT=$variant$travisEnv"
done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment