Merge pull request #8 from bengarrett/v18

Go v18.

Author: bengarrett

.github/workflows/release.yml

@@ -4,37 +4,32 @@ on:
   pull_request:
   push:
     tags:
-      - '*'
+      - "*"
 
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      -
-        name: Set up Go
+      - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
-      -
-        name: Cache Go modules
+          go-version: 1.18
+      - name: Cache Go modules
         uses: actions/cache@v1
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
-      -
-        name: Tests
+      - name: Tests
         run: |
           go mod tidy
           go test -v ./...
-      -
-        name: Run GoReleaser
+      - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest

.goreleaser.yml

@@ -9,61 +9,61 @@ before:
     - go mod tidy
 builds:
   - id: FreeBSD
-    goos: ['freebsd']
-    goarch: ['amd64']
+    goos: ["freebsd"]
+    goarch: ["amd64"]
   - id: Linux_Intel
-    goos: ['linux']
-    goarch: ['amd64']
+    goos: ["linux"]
+    goarch: ["amd64"]
   - id: macOS
-    goos: ['darwin']
-    goarch: ['amd64', 'arm64']
+    goos: ["darwin"]
+    goarch: ["amd64", "arm64"]
   - id: Windows
-    goos: ['windows']
-    goarch: ['amd64']
+    goos: ["windows"]
+    goarch: ["amd64"]
 universal_binaries:
   - id: macOS
     name_template: "{{ .ProjectName }}"
     replace: true
 archives:
   - id: FreeBSD
-    builds: ['FreeBSD']
+    builds: ["FreeBSD"]
     format: tar.gz
     files:
-    - none*
+      - none*
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
     replacements:
       amd64: Intel
       freebsd: FreeBSD
   - id: Linux_Intel
-    builds: ['Linux_Intel']
+    builds: ["Linux_Intel"]
     format: tar.gz
     files:
-    - none*
+      - none*
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
     replacements:
-      amd64: Intel
       linux: Linux
   - id: macOS
-    builds: ['macOS']
+    builds: ["macOS"]
     format: tar.gz
     files:
-    - none*
+      - none*
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
     replacements:
       darwin: macOS
+      amd64: Intel
   - id: Windows
-    builds: ['Windows']
+    builds: ["Windows"]
     format: zip
     files:
-    - none*
+      - none*
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
     replacements:
       amd64: Intel
       windows: Windows
 
 nfpms:
   - id: Linux
-    builds: ['Linux_Intel']
+    builds: ["Linux_Intel"]
     file_name_template: "{{ .ProjectName }}"
     replacements:
       amd64: Intel
@@ -104,4 +104,4 @@ scoop:
 
 changelog:
   skip: false
-  use: git
+  use: git

go.mod

@@ -1,6 +1,6 @@
 module github.com/bengarrett/zipcmt
 
-go 1.17
+go 1.18
 
 require (
 	github.com/bengarrett/retrotxtgo v0.0.37
@@ -14,6 +14,6 @@ require (
 	github.com/dlclark/regexp2 v1.4.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
-	golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
+	golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
 	golang.org/x/text v0.3.7 // indirect
 )

go.sum

@@ -13,7 +13,7 @@ import (
 	"text/tabwriter"
 
 	"github.com/bengarrett/zipcmt/internal/misc"
-	zipcmt "github.com/bengarrett/zipcmt/lib"
+	zipcmt "github.com/bengarrett/zipcmt/pkg"
 	"github.com/gookit/color"
 )
 

main.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // © Ben Garrett https://github.com/bengarrett/zipcmt
 
@@ -9,7 +8,7 @@ import (
 	"fmt"
 	"log"
 
-	zipcmt "github.com/bengarrett/zipcmt/lib"
+	zipcmt "github.com/bengarrett/zipcmt/pkg"
 )
 
 func ExampleConfig_Clean() {

lib/example_posix_test.go pkg/example_posix_test.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"log"
 
-	zipcmt "github.com/bengarrett/zipcmt/lib"
+	zipcmt "github.com/bengarrett/zipcmt/pkg"
 	"github.com/gookit/color"
 )
 

lib/example_test.go pkg/example_test.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 // © Ben Garrett https://github.com/bengarrett/zipcmt
 
@@ -9,7 +8,7 @@ import (
 	"fmt"
 	"log"
 
-	zipcmt "github.com/bengarrett/zipcmt/lib"
+	zipcmt "github.com/bengarrett/zipcmt/pkg"
 )
 
 func ExampleConfig_clean() {

lib/example_win_test.go pkg/example_win_test.go

@@ -228,8 +228,8 @@ func (c *Config) Clean() error {
 		return nil
 	}
 	name = filepath.Clean(name)
-	p := strings.Split(name, string(filepath.Separator))
-	if p[0] == "~" {
+	before, _, _ := strings.Cut(name, string(filepath.Separator))
+	if before == "~" {
 		hd, err := os.UserHomeDir()
 		if err != nil {
 			return fmt.Errorf("%s: export %w", name, err)

lib/log.go pkg/log.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	zipcmt "github.com/bengarrett/zipcmt/lib"
+	zipcmt "github.com/bengarrett/zipcmt/pkg"
 	"github.com/gookit/color"
 )