Fix some bugs in release scripts.

Signed-off-by: Daniel Nephin <[email protected]>

script/release/contributors

@@ -18,10 +18,13 @@ PREV_RELEASE=$1
 VERSION=HEAD
 URL="https://api.github.com/repos/docker/compose/compare"
 
-curl -sf "$URL/$PREV_RELEASE...$VERSION" | \
+contribs=$(curl -sf "$URL/$PREV_RELEASE...$VERSION" | \
     jq -r '.commits[].author.login' | \
     sort | \
     uniq -c | \
-    sort -nr | \
-    awk '{print "@"$2","}' | \
-    xargs echo
+    sort -nr)
+
+echo "Contributions by user: "
+echo "$contribs"
+echo
+echo "$contribs" | awk '{print "@"$2","}' | xargs

script/release/push-release

@@ -60,7 +60,7 @@ sed -i -e 's/logo.png?raw=true/https:\/\/github.com\/docker\/compose\/raw\/maste
 ./script/write-git-sha
 python setup.py sdist
 if [ "$(command -v twine 2> /dev/null)" ]; then
-    twine upload ./dist/docker-compose-${VERSION}.tar.gz
+    twine upload ./dist/docker-compose-${VERSION/-/}.tar.gz
 else
     python setup.py upload
 fi