Update .goreleaser.yml and install.sh

jckuester · Mar 6, 2020 · d6c2e33 · d6c2e33
1 parent dc9e93f
commit d6c2e33
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,6 +1,5 @@
 builds:
-  - binary: awsweeper
-    goos:
+  - goos:
       - darwin
       - windows
       - linux
@@ -22,8 +21,4 @@ archives:
     wrap_in_directory: true
     format_overrides:
       - goos: windows
-        format: zip
-    name_template: '{{ .Binary }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
-    files:
-      - LICENSE.md
-      - README.md
+        format: zip
diff --git a/README.md b/README.md
@@ -35,11 +35,11 @@ Happy erasing!
 It's recommended to install a specific version of awsweeper available on the
 [releases page](https://github.com/cloudetc/awsweeper/releases).
 
-Here is the recommended way to install awsweeper v0.5.1:
+Here is the recommended way to install awsweeper v0.6.0:
 
 ```bash
 # install it into ./bin/
-curl -sSfL https://raw.githubusercontent.com/cloudetc/awsweeper/master/install.sh | sh -s v0.5.1
+curl -sSfL https://raw.githubusercontent.com/cloudetc/awsweeper/master/install.sh | sh -s v0.6.0
 ```
 
 ## Usage

diff --git a/install.sh b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-# Code generated by godownloader on 2020-02-23T20:47:25Z. DO NOT EDIT.
+# Code generated by godownloader on 2020-03-06T15:58:36Z. DO NOT EDIT.
 #
 
 usage() {
@@ -48,7 +48,8 @@ execute() {
   http_download "${tmpdir}/${TARBALL}" "${TARBALL_URL}"
   http_download "${tmpdir}/${CHECKSUM}" "${CHECKSUM_URL}"
   hash_sha256_verify "${tmpdir}/${TARBALL}" "${tmpdir}/${CHECKSUM}"
-  srcdir="${tmpdir}"
+  srcdir="${tmpdir}/${NAME}"
+  rm -rf "${srcdir}"
   (cd "${tmpdir}" && untar "${TARBALL}")
   test ! -d "${BINDIR}" && install -d "${BINDIR}"
   for binexe in $BINARIES; do
@@ -62,8 +63,17 @@ execute() {
 }
 get_binaries() {
   case "$PLATFORM" in
+    arm/386) BINARIES="awsweeper" ;;
+    arm/amd64) BINARIES="awsweeper" ;;
+    arm64/386) BINARIES="awsweeper" ;;
+    arm64/amd64) BINARIES="awsweeper" ;;
+    darwin/386) BINARIES="awsweeper" ;;
     darwin/amd64) BINARIES="awsweeper" ;;
+    freebsd/386) BINARIES="awsweeper" ;;
+    freebsd/amd64) BINARIES="awsweeper" ;;
+    linux/386) BINARIES="awsweeper" ;;
     linux/amd64) BINARIES="awsweeper" ;;
+    windows/386) BINARIES="awsweeper" ;;
     windows/amd64) BINARIES="awsweeper" ;;
     *)
       log_crit "platform $PLATFORM is not supported.  Make sure this script is up-to-date and file request at https://github.com/${PREFIX}/issues/new"
@@ -88,6 +98,9 @@ tag_to_version() {
 }
 adjust_format() {
   # change format (tar.gz or zip) based on OS
+  case ${OS} in
+    windows) FORMAT=zip ;;
+  esac
   true
 }
 adjust_os() {