Merge pull request #4 from marverix/add-osx-and-x64

feat: Add osx and x64 keywords

Author: marverix

gah

@@ -96,7 +96,7 @@ function get_os() {
 function get_os_regexp_part() {
 	case $(get_os) in
 	linux) echo '[._-](unknown[._-])?(linux|linux-gnu|linux-musl)' ;;
-	macos) echo '[._-](apple[._-])?(darwin|macos)' ;;
+	macos) echo '[._-](apple[._-])?(darwin|macos|osx)' ;;
 	*) throw_error 10 "Your OS type is not supported" ;;
 	esac
 }
@@ -112,7 +112,7 @@ function get_arch() {
 
 function get_arch_regexp_part() {
 	case $(get_arch) in
-	amd64) echo '[._-](amd64|x86_64|universal)' ;;
+	amd64) echo '[._-](amd64|x86_64|x64|universal)' ;;
 	arm64) echo '[._-](arm64|aarch64|universal)' ;;
 	*) throw_error 11 "Your CPU/OS architecture is not supported" ;;
 	esac

test/01_regexp_functions.bats

@@ -67,7 +67,7 @@ teardown() {
 	run get_os_regexp_part
 
 	assert_success
-	assert_output '[._-](apple[._-])?(darwin|macos)'
+	assert_output '[._-](apple[._-])?(darwin|macos|osx)'
 }
 
 @test "get_os_regexp_part should exit with error code" {
@@ -130,7 +130,7 @@ teardown() {
 	run get_arch_regexp_part
 
 	assert_success
-	assert_output '[._-](amd64|x86_64|universal)'
+	assert_output '[._-](amd64|x86_64|x64|universal)'
 }
 
 @test "get_arch_regexp_part should return proper string for arm64 architecture" {
@@ -157,7 +157,7 @@ teardown() {
 	run get_filename_regexp
 
 	assert_success
-	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](unknown[._-])?(linux|linux-gnu|linux-musl)[._-](amd64|x86_64|universal)|[._-](amd64|x86_64|universal)[._-](unknown[._-])?(linux|linux-gnu|linux-musl))(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
+	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](unknown[._-])?(linux|linux-gnu|linux-musl)[._-](amd64|x86_64|x64|universal)|[._-](amd64|x86_64|x64|universal)[._-](unknown[._-])?(linux|linux-gnu|linux-musl))(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
 }
 
 @test "get_filename_regexp should return proper string for linux/arm64" {
@@ -179,7 +179,7 @@ teardown() {
 	run get_filename_regexp
 
 	assert_success
-	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](apple[._-])?(darwin|macos)[._-](amd64|x86_64|universal)|[._-](amd64|x86_64|universal)[._-](apple[._-])?(darwin|macos))(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
+	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](apple[._-])?(darwin|macos|osx)[._-](amd64|x86_64|x64|universal)|[._-](amd64|x86_64|x64|universal)[._-](apple[._-])?(darwin|macos|osx))(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
 }
 
 @test "get_filename_regexp should return proper string for macos/arm64" {
@@ -190,5 +190,5 @@ teardown() {
 	run get_filename_regexp
 
 	assert_success
-	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](apple[._-])?(darwin|macos)[._-](arm64|aarch64|universal)|[._-](arm64|aarch64|universal)[._-](apple[._-])?(darwin|macos))(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
+	assert_output '([a-z][a-z0-9_-]+?)([_-]v?[0-9.]+)?([._-](apple[._-])?(darwin|macos|osx)[._-](arm64|aarch64|universal)|[._-](arm64|aarch64|universal)[._-](apple[._-])?(darwin|macos|osx))(\.zip|\.tar\.gz|\.tar\.xz|\.tar\.bz2)?'
 }