From 3aa6bbb6488ccb347b6ce7f8f0a13b19db2ed6ba Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Mon, 31 Aug 2015 16:01:01 +1000
Subject: [PATCH] tools: update release.sh to work with new website
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

now need to specify "nodejs" or "iojs", also remove .gpg file

PR-URL: https://github.com/nodejs/node/pull/2623
Reviewed-By: jbergstroem - Johan Bergström <bugs@bergstroem.nu>

cherry-picked by @rvagg to v3.x, s/nodejs/iojs/
---
 tools/release.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/release.sh b/tools/release.sh
index fca88c97adce42..5b7037d2e85611 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -8,7 +8,7 @@
 
 set -e
 
-webhost=iojs.org
+webhost=direct.iojs.org
 webuser=dist
 promotablecmd=dist-promotable
 promotecmd=dist-promote
@@ -80,7 +80,7 @@ function sign {
     echo "GPG key for \"${version}\" tag is not yours, cannot sign"
   fi
 
-  shapath=$(ssh ${webuser}@${webhost} $signcmd $version)
+  shapath=$(ssh ${webuser}@${webhost} $signcmd iojs $version)
 
   if ! [[ ${shapath} =~ ^/.+/SHASUMS256.txt$ ]]; then
     echo 'Error: No SHASUMS file returned by sign!'
@@ -98,7 +98,6 @@ function sign {
   scp ${webuser}@${webhost}:${shapath} ${tmpdir}/${shafile}
 
   gpg --default-key $gpgkey --clearsign ${tmpdir}/${shafile}
-  gpg --default-key $gpgkey --armor --export --output ${tmpdir}/${shafile}.gpg
 
   echo "Wrote to ${tmpdir}/"
 
@@ -118,7 +117,7 @@ function sign {
     fi
 
     if [ "X${yorn}" == "Xy" ]; then
-      scp ${tmpdir}/${shafile} ${tmpdir}/${shafile}.asc ${tmpdir}/${shafile}.gpg ${webuser}@${webhost}:${shadir}/
+      scp ${tmpdir}/${shafile} ${tmpdir}/${shafile}.asc ${webuser}@${webhost}:${shadir}/
       break
     fi
   done
@@ -145,7 +144,7 @@ fi
 
 echo -e "\n# Checking for releases ..."
 
-promotable=$(ssh ${webuser}@${webhost} $promotablecmd)
+promotable=$(ssh ${webuser}@${webhost} $promotablecmd iojs)
 
 if [ "X${promotable}" == "X" ]; then
   echo "No releases to promote!"
@@ -178,7 +177,7 @@ for version in $versions; do
 
     echo -e "\n# Promoting ${version}..."
 
-    ssh ${webuser}@${webhost} $promotecmd $version
+    ssh ${webuser}@${webhost} $promotecmd iojs $version
 
     sign $version