From 99ed3001f0813149c285714574ce24686a30478f Mon Sep 17 00:00:00 2001
From: Tobias Salzmann <796084+Eun@users.noreply.github.com>
Date: Mon, 17 Oct 2022 09:25:26 +0200
Subject: [PATCH] revert changes, add fix for arm downloads

---
 .goreleaser.yml        |  6 ++----
 docs/static/install.sh | 10 ++++------
 install-task.sh        | 10 ++++------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index f6391fc1..60a03fc0 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -11,9 +11,7 @@ build:
     - arm
     - arm64
   goarm:
-    - 5
     - 6
-    - 7
   ignore:
     - goos: darwin
       goarch: 386
@@ -29,7 +27,7 @@ gomod:
   proxy: true
 
 archives:
-  - name_template: "{{.Binary}}_{{.Os}}_{{.Arch}}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+  - name_template: "{{.Binary}}_{{.Os}}_{{.Arch}}"
     files:
       - README.md
       - LICENSE
@@ -58,7 +56,7 @@ nfpms:
     formats:
       - deb
       - rpm
-    file_name_template: "{{.ProjectName}}_{{.Os}}_{{.Arch}}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+    file_name_template: "{{.ProjectName}}_{{.Os}}_{{.Arch}}"
     contents:
       - src: completion/bash/task.bash
         dst: /etc/bash_completion.d/task
diff --git a/docs/static/install.sh b/docs/static/install.sh
index c1842de6..46df0cd6 100755
--- a/docs/static/install.sh
+++ b/docs/static/install.sh
@@ -190,9 +190,9 @@ uname_arch() {
     i686) arch="386" ;;
     i386) arch="386" ;;
     aarch64) arch="arm64" ;;
-    armv5*) arch="armv5" ;;
-    armv6*) arch="armv6" ;;
-    armv7*) arch="armv7" ;;
+    armv5*) arch="arm" ;;
+    armv6*) arch="arm" ;;
+    armv7*) arch="arm" ;;
   esac
   echo ${arch}
 }
@@ -220,9 +220,7 @@ uname_arch_check() {
     386) return 0 ;;
     amd64) return 0 ;;
     arm64) return 0 ;;
-    armv5) return 0 ;;
-    armv6) return 0 ;;
-    armv7) return 0 ;;
+    arm) return 0 ;;
     ppc64) return 0 ;;
     ppc64le) return 0 ;;
     mips) return 0 ;;
diff --git a/install-task.sh b/install-task.sh
index c1842de6..46df0cd6 100755
--- a/install-task.sh
+++ b/install-task.sh
@@ -190,9 +190,9 @@ uname_arch() {
     i686) arch="386" ;;
     i386) arch="386" ;;
     aarch64) arch="arm64" ;;
-    armv5*) arch="armv5" ;;
-    armv6*) arch="armv6" ;;
-    armv7*) arch="armv7" ;;
+    armv5*) arch="arm" ;;
+    armv6*) arch="arm" ;;
+    armv7*) arch="arm" ;;
   esac
   echo ${arch}
 }
@@ -220,9 +220,7 @@ uname_arch_check() {
     386) return 0 ;;
     amd64) return 0 ;;
     arm64) return 0 ;;
-    armv5) return 0 ;;
-    armv6) return 0 ;;
-    armv7) return 0 ;;
+    arm) return 0 ;;
     ppc64) return 0 ;;
     ppc64le) return 0 ;;
     mips) return 0 ;;