updated package path

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/rsteube/carapace:latest
+FROM ghcr.io/carapace-sh/carapace:latest
 
 RUN apt-get update \
  &&  apt-get install -y bash-completion \

README.md

@@ -1,8 +1,8 @@
 # carapace-bridge
 
-[![PkgGoDev](https://pkg.go.dev/badge/github.com/rsteube/carapace-bridges)](https://pkg.go.dev/github.com/rsteube/carapace-bridge)
-[![GoReportCard](https://goreportcard.com/badge/github.com/rsteube/carapace-bridge)](https://goreportcard.com/report/github.com/rsteube/carapace-bridge)
-[![Coverage Status](https://coveralls.io/repos/github/rsteube/carapace-bridge/badge.svg?branch=master)](https://coveralls.io/github/rsteube/carapace-bridge?branch=master)
+[![PkgGoDev](https://pkg.go.dev/badge/github.com/carapace-sh/carapace-bridges)](https://pkg.go.dev/github.com/carapace-sh/carapace-bridge)
+[![GoReportCard](https://goreportcard.com/badge/github.com/carapace-sh/carapace-bridge)](https://goreportcard.com/report/github.com/carapace-sh/carapace-bridge)
+[![Coverage Status](https://coveralls.io/repos/github/carapace-sh/carapace-bridge/badge.svg?branch=master)](https://coveralls.io/github/carapace-sh/carapace-bridge?branch=master)
 [![Packaging status](https://repology.org/badge/tiny-repos/carapace-bridge.svg)](https://repology.org/project/carapace-bridge/versions)
 
 Invokes completion of various frameworks and provides bridge actions for [carapace-bin](https://github.com/rsteube/carapace-bin).
@@ -12,7 +12,7 @@ Invokes completion of various frameworks and provides bridge actions for [carapa
 Supported inputs:
 - [argcomplete](https://github.com/kislyuk/argcomplete)
 - [bash](https://www.gnu.org/software/bash/)
-- [carapace](https://github.com/rsteube/carapace)
+- [carapace](https://github.com/carapace-sh/carapace)
 - [carapace-bin](https://github.com/rsteube/carapace-bin/)
 - [clap](https://github.com/clap-rs/clap)
 - [click](https://github.com/pallets/click)
@@ -30,10 +30,10 @@ Supported outputs:
 - [Bash](https://www.gnu.org/software/bash/)
 - [Elvish](https://elv.sh/)
 - [Fish](https://fishshell.com/)
-- [Ion](https://doc.redox-os.org/ion-manual/) ([experimental](https://github.com/rsteube/carapace/issues/88))
+- [Ion](https://doc.redox-os.org/ion-manual/) ([experimental](https://github.com/carapace-sh/carapace/issues/88))
 - [Nushell](https://www.nushell.sh/)
 - [Oil](http://www.oilshell.org/)
 - [Powershell](https://microsoft.com/powershell)
-- [Tcsh](https://www.tcsh.org/) ([experimental](https://github.com/rsteube/carapace/issues/331))
+- [Tcsh](https://www.tcsh.org/) ([experimental](https://github.com/carapace-sh/carapace/issues/331))
 - [Xonsh](https://xon.sh/)
 - [Zsh](https://www.zsh.org/)

cmd/carapace-bridge/cmd/root.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
-	"github.com/rsteube/carapace/pkg/ps"
-	"github.com/rsteube/carapace/pkg/style"
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bridge/pkg/actions/bridge"
+	"github.com/carapace-sh/carapace/pkg/ps"
+	"github.com/carapace-sh/carapace/pkg/style"
 	"github.com/spf13/cobra"
 )
 
@@ -41,15 +41,15 @@ func init() {
 	addSubCommand("argcomplete", "bridges https://github.com/kislyuk/argcomplete", bridge.ActionArgcomplete)
 	addSubCommand("bash", "bridges completions registered in bash", bridge.ActionBash)
 	addSubCommand("carapace-bin", "bridges completions registered in carapace-bin", bridge.ActionCarapaceBin)
-	addSubCommand("carapace", "bridges https://github.com/rsteube/carapace", bridge.ActionCarapace)
+	addSubCommand("carapace", "bridges https://github.com/carapace-sh/carapace", bridge.ActionCarapace)
 	addSubCommand("clap", "bridges https://github.com/clap-rs/clap", bridge.ActionClap)
 	addSubCommand("click", "bridges https://github.com/pallets/click", bridge.ActionClick)
 	addSubCommand("cobra", "bridges https://github.com/spf13/cobra", bridge.ActionCobra)
 	addSubCommand("complete", "bridges https://github.com/posener/complete", bridge.ActionComplete)
 	addSubCommand("fish", "bridges completions registered in fish", bridge.ActionFish)
 	addSubCommand("inshellisense", "bridges https://github.com/microsoft/inshellisense", bridge.ActionInshellisense)
 	addSubCommand("kingpin", "bridges https://github.com/alecthomas/kingpin", bridge.ActionKingpin)
-	addSubCommand("macro", "bridges macros exposed with https://github.com/rsteube/carapace-spec", bridge.ActionMacro)
+	addSubCommand("macro", "bridges macros exposed with https://github.com/carapace-sh/carapace-spec", bridge.ActionMacro)
 	addSubCommand("powershell", "bridges completions registered in powershell", bridge.ActionPowershell)
 	addSubCommand("urfavecli", "bridges https://github.com/urfave/cli", bridge.ActionUrfavecli)
 	addSubCommand("yargs", "bridges https://github.com/yargs/yargs", bridge.ActionYargs)

cmd/carapace-bridge/main.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/rsteube/carapace-bridge/cmd/carapace-bridge/cmd"
+import "github.com/carapace-sh/carapace-bridge/cmd/carapace-bridge/cmd"
 
 var version = "develop"
 

go.mod

@@ -1,10 +1,10 @@
-module github.com/rsteube/carapace-bridge
+module github.com/carapace-sh/carapace-bridge
 
 go 1.21
 
 require (
-	github.com/rsteube/carapace v0.50.2
-	github.com/rsteube/carapace-shlex v0.1.2
+	github.com/carapace-sh/carapace v0.50.3-0.20240311152955-f3bd62ff6a23
+	github.com/carapace-sh/carapace-shlex v0.2.0
 	github.com/spf13/cobra v1.8.0
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -1,10 +1,10 @@
+github.com/carapace-sh/carapace v0.50.3-0.20240311152955-f3bd62ff6a23 h1:WPTH+2KVYPOOCjaFSl5u67Ixkj0Inir00eacQNZ2HUA=
+github.com/carapace-sh/carapace v0.50.3-0.20240311152955-f3bd62ff6a23/go.mod h1:UxflttCmX+TRfsKqA0I0cEQFn2rvwGp6iTGyO8oS4NY=
+github.com/carapace-sh/carapace-shlex v0.2.0 h1:rh2wprc8Cszf4MZV+99t9vH6wblz7zlN/3C/v7Xl0Ck=
+github.com/carapace-sh/carapace-shlex v0.2.0/go.mod h1:lJ4ZsdxytE0wHJ8Ta9S7Qq0XpjgjU0mdfCqiI2FHx7M=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/rsteube/carapace v0.50.2 h1:9nPOBmIKPySFQvtBRGghFafRCR09Cf9K4/BEo1M+VFE=
-github.com/rsteube/carapace v0.50.2/go.mod h1:syVOvI8e2rEEK/9aMZxfWuHvcnQK/EcnTV4roClEnLE=
-github.com/rsteube/carapace-shlex v0.1.2 h1:ZKjhIfXoCkEnzensMglTaLbkNOaLkmM8SCRshpJKx6s=
-github.com/rsteube/carapace-shlex v0.1.2/go.mod h1:zPw1dOFwvLPKStUy9g2BYKanI6bsQMATzDMYQQybo3o=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
 github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=

pkg/actions/bridge/argcomplete.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rsteube/carapace"
+	"github.com/carapace-sh/carapace"
 )
 
 // ActionArgcomplete bridges https://github.com/kislyuk/argcomplete

pkg/actions/bridge/bash.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/rsteube/carapace"
-	shlex "github.com/rsteube/carapace-shlex"
-	"github.com/rsteube/carapace/pkg/style"
-	"github.com/rsteube/carapace/pkg/xdg"
+	"github.com/carapace-sh/carapace"
+	shlex "github.com/carapace-sh/carapace-shlex"
+	"github.com/carapace-sh/carapace/pkg/style"
+	"github.com/carapace-sh/carapace/pkg/xdg"
 )
 
 //go:embed bash.sh
@@ -53,7 +53,7 @@ func ActionBash(command ...string) carapace.Action {
 				vals := make([]string, 0)
 				for _, line := range lines[:len(lines)-1] {
 					if splitted := strings.SplitN(line, "(", 2); len(splitted) == 2 {
-						// assume results contain descriptions in the format `value (description)` (spf13/cobra, rsteube/carapace)
+						// assume results contain descriptions in the format `value (description)` (spf13/cobra, carapace-sh/carapace)
 						vals = append(vals,
 							strings.TrimSpace(splitted[0]),
 							strings.TrimSpace(strings.TrimSuffix(splitted[1], ")")),

pkg/actions/bridge/bridge.go

@@ -3,9 +3,9 @@ package bridge
 import (
 	"slices"
 
-	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bridge/pkg/bridges"
-	"github.com/rsteube/carapace-bridge/pkg/env"
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bridge/pkg/bridges"
+	"github.com/carapace-sh/carapace-bridge/pkg/env"
 )
 
 // Bridges bridges completions as defined in bridges.yaml and CARAPACE_BRIDGE environment variable

pkg/actions/bridge/carapace.go

@@ -5,11 +5,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/rsteube/carapace"
+	"github.com/carapace-sh/carapace"
 	"github.com/spf13/cobra"
 )
 
-// ActionCarapace bridges https://github.com/rsteube/carapace
+// ActionCarapace bridges https://github.com/carapace-sh/carapace
 func ActionCarapace(command ...string) carapace.Action {
 	return actionCommand(command...)(func(command ...string) carapace.Action {
 		return carapace.ActionCallback(func(c carapace.Context) carapace.Action {

pkg/actions/bridge/clap.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rsteube/carapace"
+	"github.com/carapace-sh/carapace"
 )
 
 // ActionClap bridges https://github.com/clap-rs/clap

pkg/actions/bridge/click.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rsteube/carapace"
-	shlex "github.com/rsteube/carapace-shlex"
+	"github.com/carapace-sh/carapace"
+	shlex "github.com/carapace-sh/carapace-shlex"
 )
 
 // ActionClick bridges https://github.com/pallets/click

pkg/actions/bridge/cobra.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rsteube/carapace"
+	"github.com/carapace-sh/carapace"
 	"github.com/spf13/cobra"
 )
 

pkg/actions/bridge/complete.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rsteube/carapace"
+	"github.com/carapace-sh/carapace"
 )
 
 // ActionComplete bridges https://github.com/posener/complete

pkg/actions/bridge/fish.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rsteube/carapace"
-	shlex "github.com/rsteube/carapace-shlex"
-	"github.com/rsteube/carapace/pkg/style"
-	"github.com/rsteube/carapace/pkg/xdg"
+	"github.com/carapace-sh/carapace"
+	shlex "github.com/carapace-sh/carapace-shlex"
+	"github.com/carapace-sh/carapace/pkg/style"
+	"github.com/carapace-sh/carapace/pkg/xdg"
 )
 
 // ActionFish bridges completions registered in fish

pkg/actions/bridge/inshellisense.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/rsteube/carapace"
-	shlex "github.com/rsteube/carapace-shlex"
-	"github.com/rsteube/carapace/pkg/style"
+	"github.com/carapace-sh/carapace"
+	shlex "github.com/carapace-sh/carapace-shlex"
+	"github.com/carapace-sh/carapace/pkg/style"
 )
 
 // ActionInshellisense bridges https://github.com/microsoft/inshellisense

pkg/actions/bridge/kingpin.go

@@ -3,7 +3,7 @@ package bridge
 import (
 	"strings"
 
-	"github.com/rsteube/carapace"
+	"github.com/carapace-sh/carapace"
 )
 
 // ActionKingpin bridges https://github.com/alecthomas/kingpin

pkg/actions/bridge/powershell.go

@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/rsteube/carapace"
-	shlex "github.com/rsteube/carapace-shlex"
-	"github.com/rsteube/carapace/pkg/style"
-	"github.com/rsteube/carapace/pkg/xdg"
+	"github.com/carapace-sh/carapace"
+	shlex "github.com/carapace-sh/carapace-shlex"
+	"github.com/carapace-sh/carapace/pkg/style"
+	"github.com/carapace-sh/carapace/pkg/xdg"
 )
 
 func ensureExists(path string) (err error) {

pkg/actions/bridge/urfavecli.go

@@ -3,7 +3,7 @@ package bridge
 import (
 	"strings"
 
-	"github.com/rsteube/carapace"
+	"github.com/carapace-sh/carapace"
 )
 
 // ActionUrfavecli bridges https://github.com/urfave/cli

pkg/actions/bridge/yargs.go

@@ -4,7 +4,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/rsteube/carapace"
+	"github.com/carapace-sh/carapace"
 )
 
 // ActionYargs bridges https://github.com/yargs/yargs

pkg/actions/bridge/zsh.go

@@ -4,11 +4,11 @@ import (
 	_ "embed"
 	"strings"
 
-	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace-bridge/third_party/github.com/Valodim/zsh-capture-completion"
-	"github.com/rsteube/carapace/pkg/style"
-	"github.com/rsteube/carapace/pkg/xdg"
-	"github.com/rsteube/carapace/third_party/github.com/acarl005/stripansi"
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bridge/third_party/github.com/Valodim/zsh-capture-completion"
+	"github.com/carapace-sh/carapace/pkg/style"
+	"github.com/carapace-sh/carapace/pkg/xdg"
+	"github.com/carapace-sh/carapace/third_party/github.com/acarl005/stripansi"
 )
 
 // ActionZsh bridges completions registered in zsh

pkg/bridges/bash.go

@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/rsteube/carapace/pkg/execlog"
+	"github.com/carapace-sh/carapace/pkg/execlog"
 )
 
 func Bash() []string {

pkg/bridges/bridges.go

@@ -1,7 +1,7 @@
 package bridges
 
 import (
-	"github.com/rsteube/carapace-bridge/pkg/env"
+	"github.com/carapace-sh/carapace-bridge/pkg/env"
 )
 
 func filter(m map[string]bool, filter ...[]string) map[string]bool {

pkg/bridges/cache.go

@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/xdg"
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace/pkg/xdg"
 )
 
 func cache(s string, f func() ([]string, error)) []string {

pkg/bridges/config.go

@@ -3,8 +3,8 @@ package bridges
 import (
 	"os"
 
-	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/xdg"
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace/pkg/xdg"
 	"gopkg.in/yaml.v3"
 )
 

pkg/bridges/fish.go

@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/rsteube/carapace/pkg/execlog"
+	"github.com/carapace-sh/carapace/pkg/execlog"
 )
 
 func Fish() []string {

pkg/bridges/inshellisense.go

@@ -1,6 +1,6 @@
 package bridges
 
-import "github.com/rsteube/carapace/pkg/execlog"
+import "github.com/carapace-sh/carapace/pkg/execlog"
 
 func Inshellisense() []string {
 	if _, err := execlog.LookPath("inshellisense"); err != nil {

pkg/bridges/zsh.go

@@ -6,8 +6,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/execlog"
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace/pkg/execlog"
 )
 
 func Zsh() []string {