Skip to content
This repository has been archived by the owner on Jun 26, 2024. It is now read-only.

Commit

Permalink
✨ Use GitHub-based import path (#45)
Browse files Browse the repository at this point in the history
Vanity go modules are too complicated to deal with right now.
  • Loading branch information
wilsonehusin committed Mar 25, 2022
1 parent f2ed232 commit 15afbfd
Show file tree
Hide file tree
Showing 30 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ linters-settings:
- ^print.*$

goimports:
local-prefixes: go.xargs.dev/bindl
local-prefixes: github.com/bindl-dev/bindl

govet:
enable:
Expand Down
2 changes: 1 addition & 1 deletion cmd/bindl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"os"
"os/signal"

"go.xargs.dev/bindl/command/cli"
"github.com/bindl-dev/bindl/command/cli"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/bindl/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package main
import (
"fmt"

internalversion "github.com/bindl-dev/bindl/internal/version"
"github.com/spf13/cobra"
internalversion "go.xargs.dev/bindl/internal/version"
)

// These variables are stamped by ldflags on build, configured through goreleaser.
Expand Down
4 changes: 2 additions & 2 deletions command/cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package cli
import (
"runtime"

"github.com/bindl-dev/bindl/config"
"github.com/bindl-dev/bindl/internal/log"
"github.com/kelseyhightower/envconfig"
"github.com/spf13/cobra"
"go.xargs.dev/bindl/config"
"go.xargs.dev/bindl/internal/log"
)

var All = []*cobra.Command{
Expand Down
2 changes: 1 addition & 1 deletion command/cli/generate_ignore.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package cli

import (
"github.com/bindl-dev/bindl/command"
"github.com/spf13/cobra"
"go.xargs.dev/bindl/command"
)

var bindlGenerateIgnorePath = ".gitignore"
Expand Down
2 changes: 1 addition & 1 deletion command/cli/generate_make.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package cli

import (
"github.com/bindl-dev/bindl/command"
"github.com/spf13/cobra"
"go.xargs.dev/bindl/command"
)

var bindlGenerateMakefilePath = "Makefile.bindl"
Expand Down
4 changes: 2 additions & 2 deletions command/cli/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package cli
import (
"github.com/spf13/cobra"

"go.xargs.dev/bindl/command"
"go.xargs.dev/bindl/internal"
"github.com/bindl-dev/bindl/command"
"github.com/bindl-dev/bindl/internal"
)

var BindlGet = &cobra.Command{
Expand Down
2 changes: 1 addition & 1 deletion command/cli/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package cli
import (
"fmt"

"github.com/bindl-dev/bindl/config"
"github.com/spf13/cobra"
"go.xargs.dev/bindl/config"
)

var bindlListOneline = false
Expand Down
2 changes: 1 addition & 1 deletion command/cli/purge.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package cli

import (
"github.com/bindl-dev/bindl/command"
"github.com/spf13/cobra"
"go.xargs.dev/bindl/command"
)

var bindlPurgeAll = false
Expand Down
2 changes: 1 addition & 1 deletion command/cli/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package cli

import (
"github.com/bindl-dev/bindl/command"
"github.com/spf13/cobra"
"go.xargs.dev/bindl/command"
)

var bindlSyncStdout bool
Expand Down
2 changes: 1 addition & 1 deletion command/cli/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package cli

import (
"github.com/bindl-dev/bindl/command"
"github.com/spf13/cobra"
"go.xargs.dev/bindl/command"
)

var BindlVerify = &cobra.Command{
Expand Down
6 changes: 3 additions & 3 deletions command/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"fmt"
"sync"

"go.xargs.dev/bindl/config"
"go.xargs.dev/bindl/internal"
"go.xargs.dev/bindl/program"
"github.com/bindl-dev/bindl/config"
"github.com/bindl-dev/bindl/internal"
"github.com/bindl-dev/bindl/program"
)

// ErrFailExec is used as generic failure for command line interface as
Expand Down
8 changes: 4 additions & 4 deletions command/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"path/filepath"
"time"

"github.com/bindl-dev/bindl/config"
"github.com/bindl-dev/bindl/download"
"github.com/bindl-dev/bindl/internal"
"github.com/bindl-dev/bindl/program"
"github.com/rs/zerolog"
"go.xargs.dev/bindl/config"
"go.xargs.dev/bindl/download"
"go.xargs.dev/bindl/internal"
"go.xargs.dev/bindl/program"
)

func symlink(binDir, progDir string, p *program.Lock) error {
Expand Down
4 changes: 2 additions & 2 deletions command/ignore.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"path/filepath"
"strings"

"go.xargs.dev/bindl/config"
"go.xargs.dev/bindl/internal"
"github.com/bindl-dev/bindl/config"
"github.com/bindl-dev/bindl/internal"
)

func isNewline(c byte) bool {
Expand Down
4 changes: 2 additions & 2 deletions command/ignore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"os"
"testing"

"go.xargs.dev/bindl/command"
"go.xargs.dev/bindl/config"
"github.com/bindl-dev/bindl/command"
"github.com/bindl-dev/bindl/config"
)

func TestUpdateIgnoreFile(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions command/make.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"text/template"
"time"

"go.xargs.dev/bindl/config"
"go.xargs.dev/bindl/internal/version"
"github.com/bindl-dev/bindl/config"
"github.com/bindl-dev/bindl/internal/version"
)

var rawMakefileTmpl = `# THIS FILE WAS GENERATED BY BINDL {{ .Version }} ON {{ .Time }}
Expand Down
4 changes: 2 additions & 2 deletions command/purge.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"os"
"path/filepath"

"go.xargs.dev/bindl/config"
"go.xargs.dev/bindl/internal"
"github.com/bindl-dev/bindl/config"
"github.com/bindl-dev/bindl/internal"
)

// Purge deletes downloaded binaries. By default, it only deletes
Expand Down
6 changes: 3 additions & 3 deletions command/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"sync"
"time"

"go.xargs.dev/bindl/config"
"go.xargs.dev/bindl/internal"
"go.xargs.dev/bindl/program"
"github.com/bindl-dev/bindl/config"
"github.com/bindl-dev/bindl/internal"
"github.com/bindl-dev/bindl/program"
"sigs.k8s.io/yaml"
)

Expand Down
6 changes: 3 additions & 3 deletions command/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"os"
"path/filepath"

"go.xargs.dev/bindl/config"
"go.xargs.dev/bindl/internal"
"go.xargs.dev/bindl/program"
"github.com/bindl-dev/bindl/config"
"github.com/bindl-dev/bindl/internal"
"github.com/bindl-dev/bindl/program"
)

// Verify implements ProgramCommandFunc, therefore needs to be concurrent-safe
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package config

import "go.xargs.dev/bindl/program"
import "github.com/bindl-dev/bindl/program"

// Config is a configuration which is used to declare a project's dependencies.
// By default, this is the content of bindl.yaml
Expand Down
4 changes: 2 additions & 2 deletions config/lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"os"
"time"

"go.xargs.dev/bindl/internal"
"go.xargs.dev/bindl/program"
"github.com/bindl-dev/bindl/internal"
"github.com/bindl-dev/bindl/program"
"sigs.k8s.io/yaml"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module go.xargs.dev/bindl
module github.com/bindl-dev/bindl

go 1.18

Expand Down
2 changes: 1 addition & 1 deletion internal/internal.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package internal

import (
"github.com/bindl-dev/bindl/internal/log"
"github.com/rs/zerolog"
"go.xargs.dev/bindl/internal/log"
)

func Log() *zerolog.Logger {
Expand Down
2 changes: 1 addition & 1 deletion internal/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"fmt"
"os"

"github.com/bindl-dev/bindl/internal/log"
"github.com/fatih/color"
"go.xargs.dev/bindl/internal/log"
)

var errHeader = color.HiRedString("ERROR")
Expand Down
2 changes: 1 addition & 1 deletion program/archive_deflate.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"io"
"path/filepath"

"go.xargs.dev/bindl/internal"
"github.com/bindl-dev/bindl/internal"
)

func unzip(w io.Writer, rawZip io.ReaderAt, size int64, binaryName string) error {
Expand Down
4 changes: 2 additions & 2 deletions program/lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"sync"
"text/template"

"go.xargs.dev/bindl/download"
"go.xargs.dev/bindl/internal"
"github.com/bindl-dev/bindl/download"
"github.com/bindl-dev/bindl/internal"
)

// Lock is a configuration used by lockfile to explicitly state the
Expand Down
4 changes: 2 additions & 2 deletions program/lock_online_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"testing"

"go.xargs.dev/bindl/download"
"go.xargs.dev/bindl/program"
"github.com/bindl-dev/bindl/download"
"github.com/bindl-dev/bindl/program"
"sigs.k8s.io/yaml"
)

Expand Down
4 changes: 2 additions & 2 deletions program/lock_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"sigs.k8s.io/yaml"

"go.xargs.dev/bindl/download"
"go.xargs.dev/bindl/program"
"github.com/bindl-dev/bindl/download"
"github.com/bindl-dev/bindl/program"
)

func TestProgramChecksumsYAMLUnmarshalJSON(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion program/program.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"net/http"
"text/template"

"go.xargs.dev/bindl/internal"
"github.com/bindl-dev/bindl/internal"
)

// Base is a minimal structure which exists in every program variations
Expand Down
2 changes: 1 addition & 1 deletion program/program_online_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"testing"

"go.xargs.dev/bindl/program"
"github.com/bindl-dev/bindl/program"
"sigs.k8s.io/yaml"
)

Expand Down

0 comments on commit 15afbfd

Please sign in to comment.