Skip to content

Commit

Permalink
updated package path
Browse files Browse the repository at this point in the history
  • Loading branch information
rsteube committed Mar 11, 2024
1 parent e8ee241 commit 4c4ce2e
Show file tree
Hide file tree
Showing 5,562 changed files with 8,380 additions and 8,376 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 7 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "carapace",
"image": "ghcr.io/rsteube/carapace:v0.20.3",
"image": "ghcr.io/carapace-sh/carapace",
"settings": {
"terminal.integrated.shell.linux": "/bin/elvish"
},
Expand All @@ -10,5 +10,9 @@
"containerEnv": {
"TARGET": "/home/circleci/go/bin/carapace"
},
"onCreateCommand": [ "sh", "-c", "cd cmd && go generate ./... && go install ./..."]
}
"onCreateCommand": [
"sh",
"-c",
"cd cmd && go generate ./... && go install ./..."
]
}
2 changes: 1 addition & 1 deletion .github/conditions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ echo

$scriptdir/../cmd/carapace/carapace --condition \
| sed -r 's_(https://[^ ]+)_[\1](\1)_' \
| sed 's_^\([^ ]\+\) \+\(.*\)_- [\1]\(https://pkg.go.dev/github.com/rsteube/carapace-bin/pkg/conditions/#Condition\1) \2_' \
| sed 's_^\([^ ]\+\) \+\(.*\)_- [\1]\(https://pkg.go.dev/github.com/carapace-sh/carapace-bin/pkg/conditions/#Condition\1) \2_' \
| sed -e ':loop' -e 's_\(carapace-bin/pkg/condition/[^#]*\)[.]_\1/_' -e 't loop'
4 changes: 2 additions & 2 deletions .github/macros.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ echo

$scriptdir/../cmd/carapace/carapace --macro \
| sed -r 's_(https://[^ ]+)_[\1](\1)_' \
| sed 's_^\([^ ]*\.\)\([^. ]\+\) \+\(.*\)_- [\1\2]\(https://pkg.go.dev/github.com/rsteube/carapace-bin/pkg/actions/\1#Action\2) \3_' \
| sed 's_^\([^ ]*\.\)\([^. ]\+\) \+\(.*\)_- [\1\2]\(https://pkg.go.dev/github.com/carapace-sh/carapace-bin/pkg/actions/\1#Action\2) \3_' \
| sed -e ':loop' -e 's_\(carapace-bin/pkg/actions/[^#]*\)[.]_\1/_' -e 't loop' \
| sed 's_https://pkg.go.dev/github.com/rsteube/carapace-bin/pkg/actions/bridge_https://pkg.go.dev/github.com/rsteube/carapace-bridge/pkg/actions/bridge_'
| sed 's_https://pkg.go.dev/github.com/carapace-sh/carapace-bin/pkg/actions/bridge_https://pkg.go.dev/github.com/carapace-sh/carapace-bridge/pkg/actions/bridge_'
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

doc:
runs-on: ubuntu-latest
container: ghcr.io/rsteube/carapace
container: ghcr.io/carapace-sh/carapace
needs: build
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
git config user.email rsteube@users.noreply.github.com
git add .
git commit -m "initial commit [ci skip]"
git push --force https://rsteube:${GITHUB_TOKEN}@github.com/rsteube/carapace-bin.git master:gh-pages
git push --force https://rsteube:${GITHUB_TOKEN}@github.com/carapace-sh/carapace-bin.git master:gh-pages
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
6 changes: 3 additions & 3 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ brews:
-
name: carapace
description: "multi-shell multi-command argument completer"
homepage: "https://github.com/rsteube/carapace-bin"
homepage: "https://github.com/carapace-sh/carapace-bin"
license: "MIT"
repository:
owner: rsteube
Expand All @@ -45,7 +45,7 @@ brews:
scoops:
-
description: "multi-shell multi-command argument completer"
homepage: "https://github.com/rsteube/carapace-bin"
homepage: "https://github.com/carapace-sh/carapace-bin"
license: "MIT"
repository:
owner: rsteube
Expand All @@ -56,7 +56,7 @@ scoops:
aurs:
-
description: "multi-shell multi-command argument completer"
homepage: "https://github.com/rsteube/carapace-bin"
homepage: "https://github.com/carapace-sh/carapace-bin"
license: "MIT"
maintainers:
- rsteube <rsteube@users.noreply.github.com>
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
# carapace-bin

[![PkgGoDev](https://pkg.go.dev/badge/github.com/rsteube/carapace-bin/pkg/actions)](https://pkg.go.dev/github.com/rsteube/carapace-bin/pkg/actions)
[![GoReportCard](https://goreportcard.com/badge/github.com/rsteube/carapace-bin)](https://goreportcard.com/report/github.com/rsteube/carapace-bin)
[![documentation](https://img.shields.io/badge/&zwnj;-documentation-blue?logo=gitbook)](https://rsteube.github.io/carapace-bin/)
[![Completers](https://rsteube.github.io/carapace-bin/badge.svg)](https://rsteube.github.io/carapace-bin/completers.html)
[![Macros](https://rsteube.github.io/carapace-bin/macros-badge.svg)](https://rsteube.github.io/carapace-bin/spec/macros.html)
[![PkgGoDev](https://pkg.go.dev/badge/github.com/carapace-sh/carapace-bin/pkg/actions)](https://pkg.go.dev/github.com/carapace-sh/carapace-bin/pkg/actions)
[![GoReportCard](https://goreportcard.com/badge/github.com/carapace-sh/carapace-bin)](https://goreportcard.com/report/github.com/carapace-sh/carapace-bin)
[![documentation](https://img.shields.io/badge/&zwnj;-documentation-blue?logo=gitbook)](https://carapace-sh.github.io/carapace-bin/)
[![Completers](https://carapace-sh.github.io/carapace-bin/badge.svg)](https://carapace-sh.github.io/carapace-bin/completers.html)
[![Macros](https://carapace-sh.github.io/carapace-bin/macros-badge.svg)](https://carapace-sh.github.io/carapace-bin/spec/macros.html)
[![Packaging status](https://repology.org/badge/tiny-repos/carapace.svg)](https://repology.org/project/carapace/versions)
[![faq](https://img.shields.io/badge/discussions-faq-white)](https://github.com/rsteube/carapace-bin/discussions/categories/q-a?discussions_q=category%3AQ%26A+label%3Afaq)
[![faq](https://img.shields.io/badge/discussions-faq-white)](https://github.com/carapace-sh/carapace-bin/discussions/categories/q-a?discussions_q=category%3AQ%26A+label%3Afaq)

Carapace-bin provides argument completion for multiple CLI commands ([full list](https://rsteube.github.io/carapace-bin/completers.html)), and works across multiple POSIX and non-POSIX shells.
Carapace-bin provides argument completion for multiple CLI commands ([full list](https://carapace-sh.github.io/carapace-bin/completers.html)), and works across multiple POSIX and non-POSIX shells.
You can read more about it here: _[A pragmatic approach to shell completion](https://dev.to/rsteube/a-pragmatic-approach-to-shell-completion-4gp0)_.

[![asciicast](https://asciinema.org/a/533283.svg)](https://asciinema.org/a/533283)
Expand All @@ -20,18 +20,18 @@ Supported shells:
- [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/)

## Getting Started

Ensure carapace is added to [PATH](https://en.wikipedia.org/wiki/PATH_(variable)) ([Installation](https://rsteube.github.io/carapace-bin/installation.html)).
Then register the [completers](https://rsteube.github.io/carapace-bin/completers.html) ([Setup](https://rsteube.github.io/carapace-bin/setup.html)):
Ensure carapace is added to [PATH](https://en.wikipedia.org/wiki/PATH_(variable)) ([Installation](https://carapace-sh.github.io/carapace-bin/installation.html)).
Then register the [completers](https://carapace-sh.github.io/carapace-bin/completers.html) ([Setup](https://carapace-sh.github.io/carapace-bin/setup.html)):

```sh
# bash (~/.bashrc)
Expand Down
6 changes: 3 additions & 3 deletions cmd/carapace-fmt/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"sort"
"strings"

"github.com/rsteube/carapace"
lint "github.com/rsteube/carapace-bin/cmd/carapace-lint/cmd"
"github.com/rsteube/carapace/pkg/execlog"
"github.com/carapace-sh/carapace"
lint "github.com/carapace-sh/carapace-bin/cmd/carapace-lint/cmd"
"github.com/carapace-sh/carapace/pkg/execlog"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/carapace-fmt/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/rsteube/carapace-bin/cmd/carapace-fmt/cmd"
import "github.com/carapace-sh/carapace-bin/cmd/carapace-fmt/cmd"

func main() {
cmd.Execute()
Expand Down
22 changes: 11 additions & 11 deletions cmd/carapace-generate/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strconv"
"strings"

"github.com/rsteube/carapace/pkg/execlog"
"github.com/rsteube/carapace/pkg/util"
"github.com/carapace-sh/carapace/pkg/execlog"
"github.com/carapace-sh/carapace/pkg/util"
)

func main() {
Expand All @@ -24,7 +24,7 @@ func main() {

imports := make([]string, 0, len(names))
for _, name := range names {
imports = append(imports, fmt.Sprintf(` %v "github.com/rsteube/carapace-bin/completers/%v_completer/cmd"`, varName(name), name))
imports = append(imports, fmt.Sprintf(` %v "github.com/carapace-sh/carapace-bin/completers/%v_completer/cmd"`, varName(name), name))
}

formattedNames := make([]string, 0)
Expand Down Expand Up @@ -174,7 +174,7 @@ func macros() {

// hardcoded the bridge macros
imports := map[string]bool{
`bridge "github.com/rsteube/carapace-bridge/pkg/actions/bridge"`: true,
`bridge "github.com/carapace-sh/carapace-bridge/pkg/actions/bridge"`: true,
}
macros := []string{
`"bridge.Argcomplete": spec.MacroV(bridge.ActionArgcomplete),`,
Expand All @@ -197,16 +197,16 @@ func macros() {
descriptions := map[string]string{
"bridge.Argcomplete": "bridges https://github.com/kislyuk/argcomplete",
"bridge.Bash": "bridges https://www.gnu.org/software/bash/",
"bridge.Carapace": "bridges https://github.com/rsteube/carapace",
"bridge.CarapaceBin": "bridges https://github.com/rsteube/carapace-bin",
"bridge.Carapace": "bridges https://github.com/carapace-sh/carapace",
"bridge.CarapaceBin": "bridges https://github.com/carapace-sh/carapace-bin",
"bridge.Clap": "bridges https://github.com/clap-rs/clap",
"bridge.Click": "bridges https://github.com/pallets/click",
"bridge.Cobra": "bridges https://github.com/spf13/cobra",
"bridge.Complete": "bridges https://github.com/posener/complete",
"bridge.Fish": "bridges https://fishshell.com/",
"bridge.Inshellisense": "bridges https://github.com/microsoft/inshellisense",
"bridge.Kingpin": "bridges https://github.com/alecthomas/kingpin",
"bridge.Macro": "bridges macros exposed with https://github.com/rsteube/carapace-spec",
"bridge.Macro": "bridges macros exposed with https://github.com/carapace-sh/carapace-spec",
"bridge.Powershell": "bridges https://microsoft.com/powershell",
"bridge.Urfavecli": "bridges https://github.com/urfave/cli",
"bridge.Yargs": "bridges https://github.com/yargs/yargs",
Expand All @@ -224,7 +224,7 @@ func macros() {
defer file.Close()

pkg := strings.Replace(filepath.ToSlash(filepath.Dir(strings.TrimPrefix(path, root+"/pkg/actions/"))), "/", ".", -1)
_import := fmt.Sprintf(` %v "github.com/rsteube/carapace-bin/pkg/actions/%v"`, strings.Replace(pkg, ".", "_", -1), strings.Replace(pkg, ".", "/", -1))
_import := fmt.Sprintf(` %v "github.com/carapace-sh/carapace-bin/pkg/actions/%v"`, strings.Replace(pkg, ".", "_", -1), strings.Replace(pkg, ".", "/", -1))

scanner := bufio.NewScanner(file)
for scanner.Scan() {
Expand Down Expand Up @@ -278,7 +278,7 @@ func macros() {
import (
%v
spec "github.com/rsteube/carapace-spec"
spec "github.com/carapace-sh/carapace-spec"
)
func init() {
Expand Down Expand Up @@ -349,8 +349,8 @@ func conditions() {
content := fmt.Sprintf(`package conditions
import (
"github.com/rsteube/carapace-bin/internal/condition"
"github.com/rsteube/carapace-spec/pkg/macro"
"github.com/carapace-sh/carapace-bin/internal/condition"
"github.com/carapace-sh/carapace-spec/pkg/macro"
)
func init() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/carapace-lint/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"regexp"
"strings"

"github.com/rsteube/carapace"
"github.com/carapace-sh/carapace"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/carapace-lint/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/rsteube/carapace-bin/cmd/carapace-lint/cmd"
import "github.com/carapace-sh/carapace-bin/cmd/carapace-lint/cmd"

func main() {
cmd.Execute()
Expand Down
4 changes: 2 additions & 2 deletions cmd/carapace-parse/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sort"
"strings"

"github.com/rsteube/carapace"
"github.com/carapace-sh/carapace"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -48,7 +48,7 @@ func (c *Command) Format() string {
pattern := `package cmd
import (
"github.com/rsteube/carapace"
"github.com/carapace-sh/carapace"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/carapace-parse/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import "github.com/rsteube/carapace-bin/cmd/carapace-parse/cmd"
import "github.com/carapace-sh/carapace-bin/cmd/carapace-parse/cmd"

func main() {
cmd.Execute()
Expand Down
2 changes: 1 addition & 1 deletion cmd/carapace-shim/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"

"github.com/rsteube/carapace/pkg/xdg"
"github.com/carapace-sh/carapace/pkg/xdg"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/carapace/cmd/action/completer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package action
import (
"encoding/json"

"github.com/rsteube/carapace"
"github.com/rsteube/carapace/pkg/style"
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace/pkg/style"
)

type CompleterOpts struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/carapace/cmd/clearCache.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
"os"

"github.com/rsteube/carapace"
"github.com/rsteube/carapace/pkg/xdg"
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace/pkg/xdg"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/carapace/cmd/codegen.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
"github.com/rsteube/carapace"
"github.com/carapace-sh/carapace"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/carapace/cmd/completers/completers.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sort"
"strings"

"github.com/rsteube/carapace-bin/pkg/env"
"github.com/rsteube/carapace/pkg/xdg"
"github.com/carapace-sh/carapace-bin/pkg/env"
"github.com/carapace-sh/carapace/pkg/xdg"
"gopkg.in/yaml.v3"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/carapace/cmd/condition.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strconv"
"strings"

"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/pkg/conditions"
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace-bin/pkg/conditions"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -76,7 +76,7 @@ func printCondition(name string) {

fmt.Printf(`signature: $%v%v
description: %v
reference: https://pkg.go.dev/github.com/rsteube/carapace-bin/pkg/conditions/%v#Condition%v
reference: https://pkg.go.dev/github.com/carapace-sh/carapace-bin/pkg/conditions/%v#Condition%v
`, name, signature, m.Description, filepath.Dir(path), filepath.Base(path))
}
}
10 changes: 5 additions & 5 deletions cmd/carapace/cmd/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"fmt"
"strings"

"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/cmd/carapace/cmd/action"
"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
shlex "github.com/rsteube/carapace-shlex"
"github.com/rsteube/carapace/pkg/style"
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace-bin/cmd/carapace/cmd/action"
"github.com/carapace-sh/carapace-bridge/pkg/actions/bridge"
shlex "github.com/carapace-sh/carapace-shlex"
"github.com/carapace-sh/carapace/pkg/style"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/carapace/cmd/invoke.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"slices"
"strings"

"github.com/rsteube/carapace"
"github.com/rsteube/carapace-bin/cmd/carapace/cmd/action"
"github.com/rsteube/carapace-bin/cmd/carapace/cmd/completers"
"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
"github.com/rsteube/carapace-bridge/pkg/bridges"
"github.com/carapace-sh/carapace"
"github.com/carapace-sh/carapace-bin/cmd/carapace/cmd/action"
"github.com/carapace-sh/carapace-bin/cmd/carapace/cmd/completers"
"github.com/carapace-sh/carapace-bridge/pkg/actions/bridge"
"github.com/carapace-sh/carapace-bridge/pkg/bridges"
"github.com/spf13/cobra"
)

Expand Down
Loading

0 comments on commit 4c4ce2e

Please sign in to comment.