Merge pull request #6 from opencloud-eu/naming-binaries-is-hard

Naming binaries is hard

opencloud/cmd/opencloud/main.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/opencloud-eu/opencloud/ocis/pkg/command"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/command"
 )
 
 func main() {

opencloud/pkg/backup/backup_test.go

@@ -3,7 +3,7 @@ package backup_test
 import (
 	"testing"
 
-	"github.com/opencloud-eu/opencloud/ocis/pkg/backup"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/backup"
 	"github.com/test-go/testify/require"
 )
 

opencloud/pkg/command/backup.go

@@ -9,8 +9,8 @@ import (
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/backup"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/backup"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/benchmark.go

@@ -17,7 +17,7 @@ import (
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/version"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	"github.com/pkg/xattr"
 	"github.com/rogpeppe/go-internal/lockedfile"
 	"github.com/urfave/cli/v2"

opencloud/pkg/command/decomposedfs.go

@@ -23,7 +23,7 @@ import (
 	"github.com/cs3org/reva/v2/pkg/storagespace"
 	"github.com/cs3org/reva/v2/pkg/store"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	"github.com/rs/zerolog"
 	"github.com/urfave/cli/v2"
 )

opencloud/pkg/command/init.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults"
-	ocisinit "github.com/opencloud-eu/opencloud/ocis/pkg/init"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	ocisinit "github.com/opencloud-eu/opencloud/opencloud/pkg/init"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	cli "github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/list.go

@@ -7,7 +7,7 @@ import (
 	"net/rpc"
 
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/migrate.go

@@ -35,7 +35,7 @@ import (
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
 	oclog "github.com/opencloud-eu/opencloud/ocis-pkg/log"
 	mregistry "github.com/opencloud-eu/opencloud/ocis-pkg/registry"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/config"
 	sharingparser "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser"
 	"github.com/urfave/cli/v2"

opencloud/pkg/command/revisions.go

@@ -13,8 +13,8 @@ import (
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/revisions"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/revisions"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/root.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/opencloud-eu/opencloud/ocis-pkg/clihelper"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	"github.com/urfave/cli/v2"
 )
 
@@ -17,8 +17,8 @@ func Execute() error {
 	cfg := config.DefaultConfig()
 
 	app := clihelper.DefaultApp(&cli.App{
-		Name:  "ocis",
-		Usage: "ownCloud Infinite Scale",
+		Name:  "opencloud",
+		Usage: "opencloud",
 	})
 
 	for _, fn := range register.Commands {

opencloud/pkg/command/server.go

@@ -4,8 +4,8 @@ import (
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/runtime"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/runtime"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/services.go

@@ -6,8 +6,8 @@ import (
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/command/helper"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/command/helper"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/command"
 	antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/command"
 	appprovider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/command"

opencloud/pkg/command/shares.go

@@ -15,7 +15,7 @@ import (
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
 	mregistry "github.com/opencloud-eu/opencloud/ocis-pkg/registry"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	sharingparser "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser"
 )
 

opencloud/pkg/command/trash.go

@@ -2,12 +2,13 @@ package command
 
 import (
 	"fmt"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/trash"
+
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/trash"
 
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config/parser"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 	"github.com/urfave/cli/v2"
 )
 

opencloud/pkg/command/version.go

@@ -11,7 +11,7 @@ import (
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/registry"
 	"github.com/opencloud-eu/opencloud/ocis-pkg/version"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/register"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
 )
 
 const (

opencloud/pkg/runtime/cmd/list.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"net/rpc"
 
-	"github.com/opencloud-eu/opencloud/ocis/pkg/runtime/config"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/runtime/config"
 	"github.com/spf13/cobra"
 )
 

opencloud/pkg/runtime/runtime.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/opencloud-eu/opencloud/ocis-pkg/config"
-	"github.com/opencloud-eu/opencloud/ocis/pkg/runtime/service"
+	"github.com/opencloud-eu/opencloud/opencloud/pkg/runtime/service"
 )
 
 // Runtime represents an oCIS runtime environment.