Update import path

.woodpecker.yml

@@ -1,3 +1,4 @@
+platform: linux/amd64
 pipeline:
   release:
     image: goreleaser/goreleaser

build.go

@@ -23,13 +23,13 @@ import (
 	"path/filepath"
 
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/osutils"
-	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/pkg/build"
-	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/pkg/manager"
-	"go.elara.ws/lure/pkg/repos"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/osutils"
+	"lure.sh/lure/internal/types"
+	"lure.sh/lure/pkg/build"
+	"lure.sh/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/manager"
+	"lure.sh/lure/pkg/repos"
 )
 
 var buildCmd = &cli.Command{

fix.go

@@ -22,10 +22,10 @@ import (
 	"os"
 
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/pkg/repos"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/repos"
 )
 
 var fixCmd = &cli.Command{

go.mod

@@ -1,4 +1,4 @@
-module go.elara.ws/lure
+module lure.sh/lure
 
 go 1.18
 

info.go

@@ -23,12 +23,12 @@ import (
 	"os"
 
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/internal/cliutils"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/overrides"
-	"go.elara.ws/lure/pkg/distro"
-	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/pkg/repos"
+	"lure.sh/lure/internal/cliutils"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/overrides"
+	"lure.sh/lure/pkg/distro"
+	"lure.sh/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/repos"
 	"gopkg.in/yaml.v3"
 )
 

install.go

@@ -22,14 +22,14 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/internal/cliutils"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/pkg/build"
-	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/pkg/manager"
-	"go.elara.ws/lure/pkg/repos"
+	"lure.sh/lure/internal/cliutils"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/internal/types"
+	"lure.sh/lure/pkg/build"
+	"lure.sh/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/manager"
+	"lure.sh/lure/pkg/repos"
 )
 
 var installCmd = &cli.Command{

internal/cliutils/prompt.go

@@ -24,11 +24,11 @@ import (
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/pager"
-	"go.elara.ws/lure/internal/translations"
-	"go.elara.ws/lure/pkg/loggerctx"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/internal/pager"
+	"lure.sh/lure/internal/translations"
+	"lure.sh/lure/pkg/loggerctx"
 )
 
 // YesNoPrompt asks the user a yes or no question, using def as the default answer

internal/config/config.go

@@ -24,8 +24,8 @@ import (
 	"sync"
 
 	"github.com/pelletier/go-toml/v2"
-	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/pkg/loggerctx"
+	"lure.sh/lure/internal/types"
+	"lure.sh/lure/pkg/loggerctx"
 )
 
 var defaultConfig = &types.Config{

internal/config/lang.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"sync"
 
-	"go.elara.ws/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/loggerctx"
 	"golang.org/x/text/language"
 )
 

internal/config/paths.go

@@ -25,7 +25,7 @@ import (
 	"sync"
 
 	"github.com/pelletier/go-toml/v2"
-	"go.elara.ws/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/loggerctx"
 )
 
 // Paths contains various paths used by LURE

internal/db/db.go

@@ -28,8 +28,8 @@ import (
 	"sync"
 
 	"github.com/jmoiron/sqlx"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/pkg/loggerctx"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/pkg/loggerctx"
 	"golang.org/x/exp/slices"
 	"modernc.org/sqlite"
 )

internal/db/db_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/jmoiron/sqlx"
-	"go.elara.ws/lure/internal/db"
+	"lure.sh/lure/internal/db"
 )
 
 var testPkg = db.Package{

internal/dl/dl.go

@@ -36,8 +36,8 @@ import (
 
 	"github.com/PuerkitoBio/purell"
 	"github.com/vmihailenco/msgpack/v5"
-	"go.elara.ws/lure/internal/dlcache"
-	"go.elara.ws/lure/pkg/loggerctx"
+	"lure.sh/lure/internal/dlcache"
+	"lure.sh/lure/pkg/loggerctx"
 	"golang.org/x/exp/slices"
 )
 

internal/dl/file.go

@@ -22,18 +22,18 @@ import (
 	"bytes"
 	"context"
 	"io"
+	"mime"
 	"net/http"
 	"net/url"
 	"os"
 	"path"
 	"path/filepath"
-	"regexp"
 	"strings"
 	"time"
 
 	"github.com/mholt/archiver/v4"
 	"github.com/schollz/progressbar/v3"
-	"go.elara.ws/lure/internal/shutils"
+	"lure.sh/lure/internal/shutils"
 )
 
 // FileDownloader downloads files using HTTP
@@ -247,19 +247,18 @@ func extractFile(r io.Reader, format archiver.Format, name string, opts Options)
 	return nil
 }
 
-var cdHeaderRgx = regexp.MustCompile(`filename="?(.+)"?`)
-
 // getFilename attempts to parse the Content-Disposition
 // HTTP response header and extract a filename. If the
 // header does not exist, it will use the last element
 // of the path.
 func getFilename(res *http.Response) (name string) {
-	cd := res.Header.Get("Content-Disposition")
-	matches := cdHeaderRgx.FindStringSubmatch(cd)
-	if len(matches) > 1 {
-		name = matches[1]
-	} else {
-		name = path.Base(res.Request.URL.Path)
+	_, params, err := mime.ParseMediaType(res.Header.Get("Content-Disposition"))
+	if err != nil {
+		return path.Base(res.Request.URL.Path)
+	}
+	if filename, ok := params["filename"]; ok {
+		return filename
+	} else {
+		return path.Base(res.Request.URL.Path)
 	}
-	return name
 }

internal/dlcache/dlcache.go

@@ -26,7 +26,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"go.elara.ws/lure/internal/config"
+	"lure.sh/lure/internal/config"
 )
 
 // BasePath returns the base path of the download cache

internal/dlcache/dlcache_test.go

@@ -27,8 +27,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/dlcache"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/dlcache"
 )
 
 func init() {

internal/overrides/overrides.go

@@ -22,9 +22,9 @@ import (
 	"reflect"
 	"strings"
 
-	"go.elara.ws/lure/internal/cpu"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/pkg/distro"
+	"lure.sh/lure/internal/cpu"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/pkg/distro"
 	"golang.org/x/exp/slices"
 	"golang.org/x/text/language"
 )

internal/overrides/overrides_test.go

@@ -23,8 +23,8 @@ import (
 	"reflect"
 	"testing"
 
-	"go.elara.ws/lure/internal/overrides"
-	"go.elara.ws/lure/pkg/distro"
+	"lure.sh/lure/internal/overrides"
+	"lure.sh/lure/pkg/distro"
 	"golang.org/x/text/language"
 )
 

internal/shutils/decoder/decoder.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 
 	"github.com/mitchellh/mapstructure"
-	"go.elara.ws/lure/internal/overrides"
-	"go.elara.ws/lure/pkg/distro"
+	"lure.sh/lure/internal/overrides"
+	"lure.sh/lure/pkg/distro"
 	"golang.org/x/exp/slices"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"

internal/shutils/decoder/decoder_test.go

@@ -27,8 +27,8 @@ import (
 	"strings"
 	"testing"
 
-	"go.elara.ws/lure/internal/shutils/decoder"
-	"go.elara.ws/lure/pkg/distro"
+	"lure.sh/lure/internal/shutils/decoder"
+	"lure.sh/lure/pkg/distro"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
 )

internal/shutils/exec_test.go

@@ -23,9 +23,9 @@ import (
 	"strings"
 	"testing"
 
-	"go.elara.ws/lure/internal/shutils"
-	"go.elara.ws/lure/internal/shutils/decoder"
-	"go.elara.ws/lure/pkg/distro"
+	"lure.sh/lure/internal/shutils"
+	"lure.sh/lure/internal/shutils/decoder"
+	"lure.sh/lure/pkg/distro"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
 )

internal/shutils/helpers/helpers.go

@@ -30,7 +30,7 @@ import (
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"go.elara.ws/lure/internal/shutils"
+	"lure.sh/lure/internal/shutils"
 	"golang.org/x/exp/slices"
 	"mvdan.cc/sh/v3/interp"
 )

internal/shutils/nop_test.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"testing"
 
-	"go.elara.ws/lure/internal/shutils"
+	"lure.sh/lure/internal/shutils"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
 )

internal/translations/translations.go

@@ -24,7 +24,7 @@ import (
 	"sync"
 
 	"go.elara.ws/logger"
-	"go.elara.ws/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/loggerctx"
 	"go.elara.ws/translate"
 	"golang.org/x/text/language"
 )

internal/types/build.go

@@ -18,7 +18,7 @@
 
 package types
 
-import "go.elara.ws/lure/pkg/manager"
+import "lure.sh/lure/pkg/manager"
 
 type BuildOpts struct {
 	Script      string

list.go

@@ -22,11 +22,11 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/pkg/manager"
-	"go.elara.ws/lure/pkg/repos"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/manager"
+	"lure.sh/lure/pkg/repos"
 	"golang.org/x/exp/slices"
 )
 

main.go

@@ -28,11 +28,11 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/urfave/cli/v2"
 	"go.elara.ws/logger"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/translations"
-	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/pkg/manager"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/internal/translations"
+	"lure.sh/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/manager"
 )
 
 var app = &cli.App{

pkg/build/build.go

@@ -38,19 +38,19 @@ import (
 
 	"github.com/goreleaser/nfpm/v2"
 	"github.com/goreleaser/nfpm/v2/files"
-	"go.elara.ws/lure/internal/cliutils"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/cpu"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/dl"
-	"go.elara.ws/lure/internal/shutils"
-	"go.elara.ws/lure/internal/shutils/decoder"
-	"go.elara.ws/lure/internal/shutils/helpers"
-	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/pkg/distro"
-	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/pkg/manager"
-	"go.elara.ws/lure/pkg/repos"
+	"lure.sh/lure/internal/cliutils"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/cpu"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/internal/dl"
+	"lure.sh/lure/internal/shutils"
+	"lure.sh/lure/internal/shutils/decoder"
+	"lure.sh/lure/internal/shutils/helpers"
+	"lure.sh/lure/internal/types"
+	"lure.sh/lure/pkg/distro"
+	"lure.sh/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/manager"
+	"lure.sh/lure/pkg/repos"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
@@ -708,8 +708,6 @@ func getSources(ctx context.Context, dirs types.Directories, bv *types.BuildVars
 			LocalDir:    dirs.ScriptDir,
 		}
 
-		println("ld", opts.LocalDir)
-
 		if !strings.EqualFold(bv.Checksums[i], "SKIP") {
 			// If the checksum contains a colon, use the part before the colon
 			// as the algorithm and the part after as the actual checksum.

pkg/build/install.go

@@ -22,10 +22,10 @@ import (
 	"context"
 	"path/filepath"
 
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/pkg/loggerctx"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/internal/types"
+	"lure.sh/lure/pkg/loggerctx"
 )
 
 // InstallPkgs installs native packages via the package manager,

pkg/distro/osrelease.go

@@ -23,7 +23,7 @@ import (
 	"os"
 	"strings"
 
-	"go.elara.ws/lure/internal/shutils"
+	"lure.sh/lure/internal/shutils"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"

pkg/repos/find.go

@@ -21,7 +21,7 @@ package repos
 import (
 	"context"
 
-	"go.elara.ws/lure/internal/db"
+	"lure.sh/lure/internal/db"
 )
 
 // FindPkgs looks for packages matching the inputs inside the database.

pkg/repos/find_test.go

@@ -24,9 +24,9 @@ import (
 	"strings"
 	"testing"
 
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/pkg/repos"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/internal/types"
+	"lure.sh/lure/pkg/repos"
 )
 
 func TestFindPkgs(t *testing.T) {

pkg/repos/pull.go

@@ -34,13 +34,13 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/format/diff"
 	"github.com/pelletier/go-toml/v2"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/shutils"
-	"go.elara.ws/lure/internal/shutils/decoder"
-	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/pkg/distro"
-	"go.elara.ws/lure/pkg/loggerctx"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/internal/shutils"
+	"lure.sh/lure/internal/shutils/decoder"
+	"lure.sh/lure/internal/types"
+	"lure.sh/lure/pkg/distro"
+	"lure.sh/lure/pkg/loggerctx"
 	"go.elara.ws/vercmp"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"

pkg/repos/pull_test.go

@@ -24,10 +24,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/pkg/repos"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/internal/types"
+	"lure.sh/lure/pkg/repos"
 )
 
 func setCfgDirs(t *testing.T) {

pkg/search/search.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
 )
 
 // Filter represents search filters.

repo.go

@@ -24,11 +24,11 @@ import (
 
 	"github.com/pelletier/go-toml/v2"
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/pkg/repos"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/internal/types"
+	"lure.sh/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/repos"
 	"golang.org/x/exp/slices"
 )
 

upgrade.go

@@ -23,14 +23,14 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/lure/internal/config"
-	"go.elara.ws/lure/internal/db"
-	"go.elara.ws/lure/internal/types"
-	"go.elara.ws/lure/pkg/build"
-	"go.elara.ws/lure/pkg/distro"
-	"go.elara.ws/lure/pkg/loggerctx"
-	"go.elara.ws/lure/pkg/manager"
-	"go.elara.ws/lure/pkg/repos"
+	"lure.sh/lure/internal/config"
+	"lure.sh/lure/internal/db"
+	"lure.sh/lure/internal/types"
+	"lure.sh/lure/pkg/build"
+	"lure.sh/lure/pkg/distro"
+	"lure.sh/lure/pkg/loggerctx"
+	"lure.sh/lure/pkg/manager"
+	"lure.sh/lure/pkg/repos"
 	"go.elara.ws/vercmp"
 	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"