Update upload-binaries-gocd

Fix regex issues.

Signed-off-by: Kris Hicks <khicks@pivotal.io>

ci/scripts/upload-binaries-gocd

@@ -13,7 +13,7 @@ if [ -z "$AWS_SECRET_ACCESS_KEY" ]; then
 fi
 
 s3_config_file=$(pwd)/../../../../cli-ci/ci/s3cfg
-filename_regex="cf-cli(-installer)?([-_0-9a-z]+)?\.([a-z]+)"
+filename_regex="cf-cli(-installer)?([-_0-9a-z]+)?(\.[a-z]+)?"
 
 ls release
 
@@ -31,7 +31,7 @@ if [ $? -eq 0 ]; then
     os_arch="${BASH_REMATCH[2]}"
     extension="${BASH_REMATCH[3]}"
     if [ -z "${installer}" ]; then # don't upload edge installers
-      s3cmd --config=$s3_config_file put $f s3://go-cli/master/cf-cli_edge${os_arch}.${extension}
+      s3cmd --config=$s3_config_file put $f s3://go-cli/master/cf-cli_edge${os_arch}${extension}
     fi
   done
 fi
@@ -43,16 +43,16 @@ if [ $? -eq 0 ]; then # head is tagged as a release
   set -e
   echo "Uploading stable" $release_tag "releases"
 
-  release_tag=$( echo $match | cut -d'/' -f3 | egrep 'v[0-9]' )
+  release_tag=$( echo $match | cut -d'/' -f3 | egrep 'v[0-9]' | cut -d'v' -f2 )
   for f in $(ls release/cf-cli*);do
     [[ $f =~ $filename_regex ]]
     installer="${BASH_REMATCH[1]}"
     os_arch="${BASH_REMATCH[2]}"
     extension="${BASH_REMATCH[3]}"
-    if [ -z "${installer}" ]; then
-      s3cmd --config=$s3_config_file put $f s3://go-cli/releases/${release_tag}/cf-cli-installer_${release_tag}${os_arch}.${extension}
+    if [ -n "${installer}" ]; then
+      s3cmd --config=$s3_config_file put $f s3://go-cli/releases/${release_tag}/cf-cli_installer_${release_tag}${os_arch}${extension}
     else
-      s3cmd --config=$s3_config_file put $f s3://go-cli/releases/${release_tag}/cf_cli-${release_tag}-${os}-${arch}.${extension}
+      s3cmd --config=$s3_config_file put $f s3://go-cli/releases/${release_tag}/cf-cli_${release_tag}${os_arch}${extension}
     fi
   done
 fi