Merge pull request docker-library#102 from infosiftr/shell

tianon · tianon · commit 570880e6eb52 · 2015-10-23T11:02:36.000-07:00
Simplify update.sh
diff --git a/update.sh b/update.sh
@@ -18,9 +18,8 @@ for version in "${versions[@]}"; do
 	fullVersion="$(grep -m1 -A10 "^Package: postgresql-$version\$" "$packages" | grep -m1 '^Version: ' | cut -d' ' -f2)"
 	(
 		set -x
-		cp docker-entrypoint.sh Dockerfile.template "$version/"
-		mv "$version/Dockerfile.template" "$version/Dockerfile"
-		sed -i 's/%%PG_MAJOR%%/'$version'/g; s/%%PG_VERSION%%/'$fullVersion'/g' "$version/Dockerfile"
+		cp docker-entrypoint.sh "$version/"
+		sed 's/%%PG_MAJOR%%/'$version'/g; s/%%PG_VERSION%%/'$fullVersion'/g' Dockerfile.template > "$version/Dockerfile"
 	)
 	
 	travisEnv='\n  - VERSION='"$version$travisEnv"

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@ for version in "${versions[@]}"; do`
`18`	`18`	`fullVersion="$(grep -m1 -A10 "^Package: postgresql-$version\$" "$packages" \| grep -m1 '^Version: ' \| cut -d' ' -f2)"`
`19`	`19`	`(`
`20`	`20`	`set -x`
`21`		`- cp docker-entrypoint.sh Dockerfile.template "$version/"`
`22`		`- mv "$version/Dockerfile.template" "$version/Dockerfile"`
`23`		`- sed -i 's/%%PG_MAJOR%%/'$version'/g; s/%%PG_VERSION%%/'$fullVersion'/g' "$version/Dockerfile"`
	`21`	`+ cp docker-entrypoint.sh "$version/"`
	`22`	`+ sed 's/%%PG_MAJOR%%/'$version'/g; s/%%PG_VERSION%%/'$fullVersion'/g' Dockerfile.template > "$version/Dockerfile"`
`24`	`23`	`)`
`25`	`24`
`26`	`25`	`travisEnv='\n - VERSION='"$version$travisEnv"`