fixed version

goreleaser · Aug 17, 2017 · e431f7d · e431f7d
1 parent 83fb9c4
commit e431f7d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 26 deletions.
diff --git a/samples/godownloader-goreleaser.sh b/samples/godownloader-goreleaser.sh
@@ -89,8 +89,6 @@ adjust_version() {
     echo "$PREFIX: checking GitHub for latest version"
     VERSION=$(github_last_release "$OWNER/$REPO")
   fi
-  # if version starts with 'v', remove it
-  VERSION=${VERSION#v}
 }
 adjust_format() {
   # change format (tar.gz or zip) based on ARCH
@@ -323,9 +321,9 @@ echo "$PREFIX: found version ${VERSION} for ${OS}/${ARCH}"
 
 NAME=${BINARY}_${OS}_${ARCH}
 TARBALL=${NAME}.${FORMAT}
-TARBALL_URL=${GITHUB_DOWNLOAD}/v${VERSION}/${TARBALL}
-CHECKSUM=${BINARY}_checksums.txt
-CHECKSUM_URL=${GITHUB_DOWNLOAD}/v${VERSION}/${CHECKSUM}
+TARBALL_URL=${GITHUB_DOWNLOAD}/${VERSION}/${TARBALL}
+CHECKSUM=goreleaser_checksums.txt
+CHECKSUM_URL=${GITHUB_DOWNLOAD}/${VERSION}/${CHECKSUM}
 
 # Adjust binary name if windows
 if [ "$OS" = "windows" ]; then

diff --git a/samples/godownloader-hugo.sh b/samples/godownloader-hugo.sh
@@ -112,8 +112,6 @@ adjust_version() {
     echo "$PREFIX: checking GitHub for latest version"
     VERSION=$(github_last_release "$OWNER/$REPO")
   fi
-  # if version starts with 'v', remove it
-  VERSION=${VERSION#v}
 }
 adjust_format() {
   # change format (tar.gz or zip) based on ARCH
@@ -358,9 +356,9 @@ echo "$PREFIX: found version ${VERSION} for ${OS}/${ARCH}"
 
 NAME=${BINARY}_${VERSION}_${OS}-${ARCH}
 TARBALL=${NAME}.${FORMAT}
-TARBALL_URL=${GITHUB_DOWNLOAD}/v${VERSION}/${TARBALL}
-CHECKSUM=${BINARY}_checksums.txt
-CHECKSUM_URL=${GITHUB_DOWNLOAD}/v${VERSION}/${CHECKSUM}
+TARBALL_URL=${GITHUB_DOWNLOAD}/${VERSION}/${TARBALL}
+CHECKSUM=hugo_checksums.txt
+CHECKSUM_URL=${GITHUB_DOWNLOAD}/${VERSION}/${CHECKSUM}
 
 # Adjust binary name if windows
 if [ "$OS" = "windows" ]; then

diff --git a/samples/godownloader-misspell.sh b/samples/godownloader-misspell.sh
@@ -81,8 +81,6 @@ adjust_version() {
     echo "$PREFIX: checking GitHub for latest version"
     VERSION=$(github_last_release "$OWNER/$REPO")
   fi
-  # if version starts with 'v', remove it
-  VERSION=${VERSION#v}
 }
 adjust_format() {
   # change format (tar.gz or zip) based on ARCH
@@ -308,9 +306,9 @@ echo "$PREFIX: found version ${VERSION} for ${OS}/${ARCH}"
 
 NAME=${BINARY}_${VERSION}_${OS}_${ARCH}
 TARBALL=${NAME}.${FORMAT}
-TARBALL_URL=${GITHUB_DOWNLOAD}/v${VERSION}/${TARBALL}
-CHECKSUM=${BINARY}_checksums.txt
-CHECKSUM_URL=${GITHUB_DOWNLOAD}/v${VERSION}/${CHECKSUM}
+TARBALL_URL=${GITHUB_DOWNLOAD}/${VERSION}/${TARBALL}
+CHECKSUM=misspell_checksums.txt
+CHECKSUM_URL=${GITHUB_DOWNLOAD}/${VERSION}/${CHECKSUM}
 
 # Adjust binary name if windows
 if [ "$OS" = "windows" ]; then

diff --git a/scripts/build_samples.sh b/scripts/build_samples.sh
@@ -1,8 +1,8 @@
 #!/bin/sh -ex
-
-./godownloader -repo gohugoio/hugo > samples/godownloader-hugo.sh
-./godownloader -repo goreleaser/goreleaser > samples/godownloader-goreleaser.sh
-./godownloader -repo client9/misspell > samples/godownloader-misspell.sh
-./godownloader -source equinoxio -repo tdewolff/minify > samples/godownloader-minify.sh
-./godownloader -source raw -repo mvdan/sh -exe shfmt > samples/godownloader-shfmt.sh
+./godownloader -repo gohugoio/hugo >samples/godownloader-hugo.sh
+./godownloader -repo goreleaser/goreleaser >samples/godownloader-goreleaser.sh
+./godownloader -repo client9/misspell >samples/godownloader-misspell.sh
+./godownloader -source equinoxio -repo tdewolff/minify >samples/godownloader-minify.sh
+./godownloader -source raw -repo mvdan/sh -exe shfmt >samples/godownloader-shfmt.sh
+./godownloader -repo serverless/event-gateway >samples/godownloader-event-gateway.sh
 chmod a+x samples/*.sh
diff --git a/shell_godownloader.go b/shell_godownloader.go
@@ -111,8 +111,6 @@ adjust_version() {
     echo "$PREFIX: checking GitHub for latest version"
     VERSION=$(github_last_release "$OWNER/$REPO")
   fi
-  # if version starts with 'v', remove it
-  VERSION=${VERSION#v}
 }
 adjust_format() {
   # change format (tar.gz or zip) based on ARCH
@@ -177,9 +175,9 @@ echo "$PREFIX: found version ${VERSION} for ${OS}/${ARCH}"
 
 {{ .Archive.NameTemplate }}
 TARBALL=${NAME}.${FORMAT}
-TARBALL_URL=${GITHUB_DOWNLOAD}/v${VERSION}/${TARBALL}
-CHECKSUM=${BINARY}_checksums.txt
-CHECKSUM_URL=${GITHUB_DOWNLOAD}/v${VERSION}/${CHECKSUM}
+TARBALL_URL=${GITHUB_DOWNLOAD}/${VERSION}/${TARBALL}
+CHECKSUM={{.ProjectName}}_checksums.txt
+CHECKSUM_URL=${GITHUB_DOWNLOAD}/${VERSION}/${CHECKSUM}
 
 # Adjust binary name if windows
 if [ "$OS" = "windows" ]; then