feat: rename refs, add github action and new index file

Jabba-Team · Oct 18, 2022 · 9acd8ad · 9acd8ad
1 parent 0185403
commit 9acd8ad
Show file tree

Hide file tree

Showing 23 changed files with 4,257 additions and 1,692 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,22 @@
+name: make Jabba
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  make:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          stable: 'false'
+          go-version: '1.16.15'
+      - name: fetch
+        run: make fetch
+      - name: test
+        run: make test 
+
diff --git a/.travis.yml b/.travis.yml
diff --git a/Makefile b/Makefile
@@ -39,11 +39,11 @@ install: build
 
 publish: clean build-release
 	test -n "$(GITHUB_TOKEN)" # $$GITHUB_TOKEN must be set
-	github-release release --user shyiko --repo jabba --tag ${VERSION} \
+	github-release release --user patrick-mccourt --repo Jabba-Team/jabba --tag ${VERSION} \
 	--name "${VERSION}" --description "${VERSION}" && \
-	github-release upload --user shyiko --repo jabba --tag ${VERSION} \
+	github-release upload --user patrick-mccourt --repo Jabba-Team/jabba --tag ${VERSION} \
 	--name "jabba-${VERSION}-windows-amd64.exe" --file release/jabba-${VERSION}-windows-amd64.exe; \
 	for qualifier in darwin-amd64 linux-386 linux-amd64 linux-arm linux-arm64; do \
-		github-release upload --user shyiko --repo jabba --tag ${VERSION} \
+		github-release upload --user patrick-mccourt --repo Jabba-Team/jabba --tag ${VERSION} \
 		--name "jabba-${VERSION}-$$qualifier" --file release/jabba-${VERSION}-$$qualifier; \
 	done
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# jabba ![Latest Version](https://img.shields.io/badge/latest-0.11.2-blue.svg) [![Build Status](https://travis-ci.org/shyiko/jabba.svg?branch=master)](https://travis-ci.org/shyiko/jabba)
+# jabba ![Latest Version](https://img.shields.io/badge/latest-0.11.2-blue.svg) [![Build Status](https://travis-ci.org/Jabba-Team/jabba.svg?branch=master)](https://travis-ci.org/Jabba-Team/jabba)
 
 Java Version Manager inspired by [nvm](https://github.com/creationix/nvm) (Node.js). Written in Go.
 
@@ -31,7 +31,7 @@ the OS (macOS, Linux x86/x86_64/ARMv7+, Windows x86_64).
 
 ```sh
 export JABBA_VERSION=...
-curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | bash && . ~/.jabba/jabba.sh
+curl -sL https://github.com/Jabba-Team/jabba/raw/main/install.sh | bash && . ~/.jabba/jabba.sh
 ```
 
 > (use the same command to upgrade)
@@ -40,7 +40,7 @@ The script modifies common shell rc files by default. To skip these provide the
 
 ```sh
 export JABBA_VERSION=...
-curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | bash -s -- --skip-rc && . ~/.jabba/jabba.sh
+curl -sL https://github.com/Jabba-Team/jabba/raw/main/install.sh | bash -s -- --skip-rc && . ~/.jabba/jabba.sh
 ```
 
 Make sure to source `jabba.sh` in your environment if you skip it:
@@ -52,7 +52,7 @@ export JABBA_VERSION=...
 
 > In [fish](https://fishshell.com/) command looks a little bit different -
 > export JABBA_VERSION=...
-`curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | bash; and . ~/.jabba/jabba.fish` 
+`curl -sL https://github.com/Jabba-Team/jabba/raw/main/install.sh | bash; and . ~/.jabba/jabba.fish` 
 
 > If you don't have `curl` installed - replace `curl -sL` with `wget -qO-`.
 
@@ -71,7 +71,7 @@ integration script(s) to be included in the final Docker image, all you want is
 ```dockerfile
 FROM buildpack-deps:jessie-curl
 
-RUN curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | \
+RUN curl -sL https://github.com/Jabba-Team/jabba/raw/main/install.sh | \
     JABBA_COMMAND="install 1.15.0 -o /jdk" bash
 
 ENV JAVA_HOME /jdk
@@ -94,7 +94,7 @@ java version "1.15.0....
 ```powershell
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 Invoke-Expression (
-  Invoke-WebRequest https://github.com/shyiko/jabba/raw/master/install.ps1 -UseBasicParsing
+  Invoke-WebRequest https://github.com/Jabba-Team/jabba/raw/main/install.ps1 -UseBasicParsing
 ).Content
 ```
 
@@ -169,8 +169,8 @@ For more information see `jabba --help`.
 > PREREQUISITE: [go1.8](https://github.com/moovweb/gvm)
 
 ```sh
-git clone https://github.com/shyiko/jabba $GOPATH/src/github.com/shyiko/jabba 
-cd $GOPATH/src/github.com/shyiko/jabba 
+git clone https://github.com/Jabba-Team/jabba $GOPATH/src/github.com/Jabba-Team/jabba 
+cd $GOPATH/src/github.com/Jabba-Team/jabba 
 make fetch
 
 go run jabba.go

diff --git a/cfg/cfg.go b/cfg/cfg.go
@@ -1,10 +1,11 @@
 package cfg
 
 import (
-	log "github.com/Sirupsen/logrus"
-	"github.com/mitchellh/go-homedir"
 	"os"
 	"path/filepath"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/mitchellh/go-homedir"
 )
 
 func Dir() string {
@@ -22,7 +23,7 @@ func Dir() string {
 func Index() string {
 	registry := os.Getenv("JABBA_INDEX")
 	if registry == "" {
-		registry = "https://github.com/shyiko/jabba/raw/master/index.json"
+		registry = "https://github.com/Jabba-Team/jabba/raw/fix/build/index.json"
 	}
 	return registry
 }
diff --git a/command/alias.go b/command/alias.go
@@ -1,10 +1,11 @@
 package command
 
 import (
-	"github.com/shyiko/jabba/cfg"
 	"io/ioutil"
 	"os"
 	"path/filepath"
+
+	"github.com/Jabba-Team/jabba/cfg"
 )
 
 func SetAlias(name string, ver string) (err error) {

diff --git a/command/current.go b/command/current.go
@@ -1,11 +1,12 @@
 package command
 
 import (
-	"github.com/shyiko/jabba/cfg"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
+
+	"github.com/Jabba-Team/jabba/cfg"
 )
 
 var lookPath = exec.LookPath

diff --git a/command/current_test.go b/command/current_test.go
@@ -1,9 +1,10 @@
 package command
 
 import (
-	"github.com/shyiko/jabba/cfg"
 	"path/filepath"
 	"testing"
+
+	"github.com/Jabba-Team/jabba/cfg"
 )
 
 func TestCurrent(t *testing.T) {

diff --git a/command/deactivate.go b/command/deactivate.go
@@ -1,10 +1,11 @@
 package command
 
 import (
-	"github.com/shyiko/jabba/cfg"
 	"os"
 	"path/filepath"
 	"regexp"
+
+	"github.com/Jabba-Team/jabba/cfg"
 )
 
 func Deactivate() ([]string, error) {

diff --git a/command/deactivate_test.go b/command/deactivate_test.go
@@ -1,10 +1,11 @@
 package command
 
 import (
-	"github.com/shyiko/jabba/cfg"
 	"os"
 	"reflect"
 	"testing"
+
+	"github.com/Jabba-Team/jabba/cfg"
 )
 
 func TestDeactivate(t *testing.T) {

diff --git a/command/install.go b/command/install.go
@@ -6,13 +6,6 @@ import (
 	"compress/gzip"
 	"errors"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/mitchellh/ioprogress"
-	"github.com/shyiko/jabba/cfg"
-	"github.com/shyiko/jabba/command/fileiter"
-	"github.com/shyiko/jabba/semver"
-	"github.com/shyiko/jabba/w32"
-	"github.com/xi2/xz"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -23,6 +16,14 @@ import (
 	"runtime"
 	"sort"
 	"strings"
+
+	"github.com/Jabba-Team/jabba/cfg"
+	"github.com/Jabba-Team/jabba/command/fileiter"
+	"github.com/Jabba-Team/jabba/semver"
+	"github.com/Jabba-Team/jabba/w32"
+	log "github.com/Sirupsen/logrus"
+	"github.com/mitchellh/ioprogress"
+	"github.com/xi2/xz"
 )
 
 func Install(selector string, dst string) (string, error) {
@@ -323,7 +324,7 @@ func assertJavaDistribution(dir string, goos string) error {
 	var err error
 	if _, err = os.Stat(path); os.IsNotExist(err) {
 		err = errors.New(path + " wasn't found. " +
-			"If you believe this is an error - please create a ticket at https://github.com/shyiko/jabba/issues " +
+			"If you believe this is an error - please create a ticket at https://github.com/Jabba-Team/jabba/issues " +
 			"(specify OS and command that was used)")
 	}
 	return err

diff --git a/command/link.go b/command/link.go
@@ -2,13 +2,14 @@ package command
 
 import (
 	"errors"
-	log "github.com/Sirupsen/logrus"
-	"github.com/shyiko/jabba/cfg"
-	"github.com/shyiko/jabba/semver"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
+
+	"github.com/Jabba-Team/jabba/cfg"
+	"github.com/Jabba-Team/jabba/semver"
+	log "github.com/Sirupsen/logrus"
 )
 
 func Link(selector string, dir string) error {

diff --git a/command/ls-remote.go b/command/ls-remote.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shyiko/jabba/cfg"
-	"github.com/shyiko/jabba/semver"
+	"github.com/Jabba-Team/jabba/cfg"
+	"github.com/Jabba-Team/jabba/semver"
 )
 
 type byOS map[string]byArch

diff --git a/command/ls.go b/command/ls.go
@@ -2,13 +2,14 @@ package command
 
 import (
 	"fmt"
-	"github.com/shyiko/jabba/cfg"
-	"github.com/shyiko/jabba/semver"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
 	"strings"
+
+	"github.com/Jabba-Team/jabba/cfg"
+	"github.com/Jabba-Team/jabba/semver"
 )
 
 var readDir = ioutil.ReadDir

diff --git a/command/uninstall.go b/command/uninstall.go
@@ -1,9 +1,10 @@
 package command
 
 import (
-	"github.com/shyiko/jabba/cfg"
 	"os"
 	"path/filepath"
+
+	"github.com/Jabba-Team/jabba/cfg"
 )
 
 func Uninstall(selector string) error {

diff --git a/command/use.go b/command/use.go
@@ -1,11 +1,12 @@
 package command
 
 import (
-	"github.com/shyiko/jabba/cfg"
 	"os"
 	"path/filepath"
 	"regexp"
 	"runtime"
+
+	"github.com/Jabba-Team/jabba/cfg"
 )
 
 func Use(selector string) ([]string, error) {

diff --git a/command/use_test.go b/command/use_test.go
@@ -1,12 +1,13 @@
 package command
 
 import (
-	"github.com/shyiko/jabba/cfg"
 	"os"
 	"reflect"
 	"runtime"
 	"testing"
 	"time"
+
+	"github.com/Jabba-Team/jabba/cfg"
 )
 
 type FileInfoMock string

diff --git a/command/which.go b/command/which.go
@@ -1,9 +1,10 @@
 package command
 
 import (
-	"github.com/shyiko/jabba/cfg"
 	"path/filepath"
 	"runtime"
+
+	"github.com/Jabba-Team/jabba/cfg"
 )
 
 func Which(selector string, home bool) (string, error) {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/shyiko/jabba
+module github.com/Jabba-Team/jabba
 
 go 1.15