From 8f3082f96f9648546cb7dd92882acea6d9a3dac0 Mon Sep 17 00:00:00 2001
From: Daniel <dhaavi@users.noreply.github.com>
Date: Thu, 27 Jun 2019 13:29:56 +0200
Subject: [PATCH] Update import paths
---
README.md | 6 +++---
api/client/client.go | 2 +-
api/client/message.go | 4 ++--
api/client/websocket.go | 2 +-
api/config.go | 4 ++--
api/database.go | 10 +++++-----
api/main.go | 2 +-
api/router.go | 2 +-
api/testclient/serve.go | 2 +-
apitest.go | 16 ++++++++--------
build | 2 +-
config/database.go | 12 ++++++------
config/get_test.go | 2 +-
config/layers.go | 2 +-
config/main.go | 4 ++--
config/option.go | 2 +-
config/persistence.go | 2 +-
container/container.go | 3 +--
container/container_test.go | 2 +-
crypto/hash/hash.go | 2 +-
crypto/random/entropy.go | 4 ++--
crypto/random/get.go | 2 +-
crypto/random/osfeeder.go | 2 +-
crypto/random/rng.go | 4 ++--
crypto/random/rng_test.go | 2 +-
crypto/random/test/main.go | 2 +-
database/accessor/accessor_test.go | 2 +-
database/boilerplate_test.go | 2 +-
database/controller.go | 8 ++++----
database/controllers.go | 2 +-
database/database_test.go | 8 ++++----
database/dbmodule/db.go | 4 ++--
database/dbmodule/maintenance.go | 4 ++--
database/hook.go | 4 ++--
database/hookbase.go | 2 +-
database/interface.go | 8 ++++----
database/iterator/iterator.go | 2 +-
database/maintenance.go | 4 ++--
database/query/condition-and.go | 2 +-
database/query/condition-bool.go | 2 +-
database/query/condition-error.go | 2 +-
database/query/condition-exists.go | 2 +-
database/query/condition-float.go | 2 +-
database/query/condition-int.go | 2 +-
database/query/condition-not.go | 2 +-
database/query/condition-or.go | 2 +-
database/query/condition-regex.go | 2 +-
database/query/condition-string.go | 2 +-
database/query/condition-stringslice.go | 4 ++--
database/query/condition.go | 2 +-
database/query/query.go | 4 ++--
database/query/query_test.go | 4 ++--
database/record/base.go | 6 +++---
database/record/formats.go | 2 +-
database/record/meta-bench_test.go | 8 ++++----
database/record/record.go | 2 +-
database/record/wrapper.go | 8 ++++----
database/record/wrapper_test.go | 2 +-
database/storage/badger/badger.go | 10 +++++-----
database/storage/badger/badger_test.go | 4 ++--
database/storage/bbolt/bbolt.go | 8 ++++----
database/storage/bbolt/bbolt_test.go | 4 ++--
database/storage/fstree/fstree.go | 8 ++++----
database/storage/injectbase.go | 6 +++---
database/storage/interface.go | 6 +++---
database/storage/sinkhole/sinkhole.go | 8 ++++----
database/subscription.go | 4 ++--
formats/dsd/dsd.go | 2 +-
info/flags.go | 2 +-
log/formatting_windows.go | 2 +-
log/output.go | 2 +-
modules/start.go | 2 +-
modules/stop.go | 2 +-
notifications/database.go | 12 ++++++------
notifications/module.go | 2 +-
notifications/notification.go | 4 ++--
portbase.go | 6 +++---
utils/osdetail/test/main.go | 2 +-
78 files changed, 153 insertions(+), 154 deletions(-)
diff --git a/README.md b/README.md
index b738434..877516c 100644
--- a/README.md
+++ b/README.md
@@ -118,9 +118,9 @@ If you build everything with modules, your main program should be similar to thi
"os/signal"
"syscall"
- "github.com/Safing/portbase/info"
- "github.com/Safing/portbase/log"
- "github.com/Safing/portbase/modules"
+ "github.com/safing/portbase/info"
+ "github.com/safing/portbase/log"
+ "github.com/safing/portbase/modules"
// include packages here
_ "path/to/my/custom/module"
diff --git a/api/client/client.go b/api/client/client.go
index bbdb14e..1c8d4d4 100644
--- a/api/client/client.go
+++ b/api/client/client.go
@@ -5,7 +5,7 @@ import (
"sync"
"time"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/log"
"github.com/gorilla/websocket"
"github.com/tevino/abool"
)
diff --git a/api/client/message.go b/api/client/message.go
index 31864c1..8ade82e 100644
--- a/api/client/message.go
+++ b/api/client/message.go
@@ -4,8 +4,8 @@ import (
"bytes"
"errors"
- "github.com/Safing/portbase/container"
- "github.com/Safing/portbase/formats/dsd"
+ "github.com/safing/portbase/container"
+ "github.com/safing/portbase/formats/dsd"
"github.com/tevino/abool"
)
diff --git a/api/client/websocket.go b/api/client/websocket.go
index 70e2e35..9856d9f 100644
--- a/api/client/websocket.go
+++ b/api/client/websocket.go
@@ -4,7 +4,7 @@ import (
"fmt"
"sync"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/log"
"github.com/tevino/abool"
"github.com/gorilla/websocket"
diff --git a/api/config.go b/api/config.go
index e146f0b..8a6e885 100644
--- a/api/config.go
+++ b/api/config.go
@@ -3,8 +3,8 @@ package api
import (
"flag"
- "github.com/Safing/portbase/config"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/config"
+ "github.com/safing/portbase/log"
)
var (
diff --git a/api/database.go b/api/database.go
index 22415fc..0f900ed 100644
--- a/api/database.go
+++ b/api/database.go
@@ -10,11 +10,11 @@ import (
"github.com/tevino/abool"
"github.com/tidwall/gjson"
- "github.com/Safing/portbase/container"
- "github.com/Safing/portbase/database"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/container"
+ "github.com/safing/portbase/database"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
+ "github.com/safing/portbase/log"
)
const (
diff --git a/api/main.go b/api/main.go
index 77e4339..4a3c3d9 100644
--- a/api/main.go
+++ b/api/main.go
@@ -1,7 +1,7 @@
package api
import (
- "github.com/Safing/portbase/modules"
+ "github.com/safing/portbase/modules"
)
func init() {
diff --git a/api/router.go b/api/router.go
index 5e4e42e..2ef02cc 100644
--- a/api/router.go
+++ b/api/router.go
@@ -5,7 +5,7 @@ import (
"github.com/gorilla/mux"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/log"
)
var (
diff --git a/api/testclient/serve.go b/api/testclient/serve.go
index 690e49b..01c40e5 100644
--- a/api/testclient/serve.go
+++ b/api/testclient/serve.go
@@ -3,7 +3,7 @@ package testclient
import (
"net/http"
- "github.com/Safing/portbase/api"
+ "github.com/safing/portbase/api"
)
func init() {
diff --git a/apitest.go b/apitest.go
index 1f706af..8d7969d 100644
--- a/apitest.go
+++ b/apitest.go
@@ -7,16 +7,16 @@ import (
"syscall"
"time"
- "github.com/Safing/portbase/info"
- "github.com/Safing/portbase/log"
- "github.com/Safing/portbase/modules"
+ "github.com/safing/portbase/info"
+ "github.com/safing/portbase/log"
+ "github.com/safing/portbase/modules"
// include packages here
- _ "github.com/Safing/portbase/api"
- _ "github.com/Safing/portbase/api/testclient"
- "github.com/Safing/portbase/config"
- _ "github.com/Safing/portbase/crypto/random"
- _ "github.com/Safing/portbase/database/dbmodule"
+ _ "github.com/safing/portbase/api"
+ _ "github.com/safing/portbase/api/testclient"
+ "github.com/safing/portbase/config"
+ _ "github.com/safing/portbase/crypto/random"
+ _ "github.com/safing/portbase/database/dbmodule"
)
// var (
diff --git a/build b/build
index 8c730c0..aa762e7 100755
--- a/build
+++ b/build
@@ -48,5 +48,5 @@ echo "This information is useful for debugging and license compliance."
echo "Run the compiled binary with the -version flag to see the information included."
# build
-BUILD_PATH="github.com/Safing/portbase/info"
+BUILD_PATH="github.com/safing/portbase/info"
go build -ldflags "-X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" $@
diff --git a/config/database.go b/config/database.go
index e83f272..9c1f8fa 100644
--- a/config/database.go
+++ b/config/database.go
@@ -5,12 +5,12 @@ import (
"sort"
"strings"
- "github.com/Safing/portbase/log"
- "github.com/Safing/portbase/database"
- "github.com/Safing/portbase/database/storage"
- "github.com/Safing/portbase/database/record"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/iterator"
+ "github.com/safing/portbase/log"
+ "github.com/safing/portbase/database"
+ "github.com/safing/portbase/database/storage"
+ "github.com/safing/portbase/database/record"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/iterator"
)
var (
diff --git a/config/get_test.go b/config/get_test.go
index b53a5e0..0efc216 100644
--- a/config/get_test.go
+++ b/config/get_test.go
@@ -3,7 +3,7 @@ package config
import (
"testing"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/log"
)
func parseAndSetConfig(jsonData string) error {
diff --git a/config/layers.go b/config/layers.go
index cc8eac1..4a54edc 100644
--- a/config/layers.go
+++ b/config/layers.go
@@ -5,7 +5,7 @@ import (
"sync"
"fmt"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/log"
)
var (
diff --git a/config/main.go b/config/main.go
index c452c3c..52a2a4d 100644
--- a/config/main.go
+++ b/config/main.go
@@ -4,8 +4,8 @@ import (
"os"
"path"
- "github.com/Safing/portbase/database"
- "github.com/Safing/portbase/modules"
+ "github.com/safing/portbase/database"
+ "github.com/safing/portbase/modules"
)
func init() {
diff --git a/config/option.go b/config/option.go
index 85b366a..92d7a76 100644
--- a/config/option.go
+++ b/config/option.go
@@ -7,7 +7,7 @@ import (
"github.com/tidwall/sjson"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/record"
)
// Variable Type IDs for frontend Identification. Use ExternalOptType for extended types in the frontend.
diff --git a/config/persistence.go b/config/persistence.go
index d00e3b2..d1f4bb7 100644
--- a/config/persistence.go
+++ b/config/persistence.go
@@ -6,7 +6,7 @@ import (
"io/ioutil"
"strings"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/log"
)
var (
diff --git a/container/container.go b/container/container.go
index 1c9a5e3..ebad1ab 100644
--- a/container/container.go
+++ b/container/container.go
@@ -1,10 +1,9 @@
-// Package container gives you a []byte slice on steroids, allowing for quick data appending, prepending and fetching as well as transparent error transportation.
package container
import (
"errors"
- "github.com/Safing/portbase/formats/varint"
+ "github.com/safing/portbase/formats/varint"
)
// Container is []byte sclie on steroids, allowing for quick data appending, prepending and fetching as well as transparent error transportation. (Error transportation requires use of varints for data)
diff --git a/container/container_test.go b/container/container_test.go
index 643b331..bcaa23b 100644
--- a/container/container_test.go
+++ b/container/container_test.go
@@ -5,7 +5,7 @@ import (
"errors"
"testing"
- "github.com/Safing/portbase/utils"
+ "github.com/safing/portbase/utils"
)
var (
diff --git a/crypto/hash/hash.go b/crypto/hash/hash.go
index 3b550d2..be3a763 100644
--- a/crypto/hash/hash.go
+++ b/crypto/hash/hash.go
@@ -10,7 +10,7 @@ import (
"fmt"
"io"
- "github.com/Safing/portbase/formats/varint"
+ "github.com/safing/portbase/formats/varint"
)
type Hash struct {
diff --git a/crypto/random/entropy.go b/crypto/random/entropy.go
index c9b7754..8dd19df 100644
--- a/crypto/random/entropy.go
+++ b/crypto/random/entropy.go
@@ -5,8 +5,8 @@ import (
"github.com/tevino/abool"
- "github.com/Safing/portbase/config"
- "github.com/Safing/portbase/container"
+ "github.com/safing/portbase/config"
+ "github.com/safing/portbase/container"
)
var (
diff --git a/crypto/random/get.go b/crypto/random/get.go
index 0403c61..08587f5 100644
--- a/crypto/random/get.go
+++ b/crypto/random/get.go
@@ -7,7 +7,7 @@ import (
"math"
"time"
- "github.com/Safing/portbase/config"
+ "github.com/safing/portbase/config"
)
var (
diff --git a/crypto/random/osfeeder.go b/crypto/random/osfeeder.go
index aed0ea0..349f86a 100644
--- a/crypto/random/osfeeder.go
+++ b/crypto/random/osfeeder.go
@@ -4,7 +4,7 @@ import (
"crypto/rand"
"time"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/log"
)
func osFeeder() {
diff --git a/crypto/random/rng.go b/crypto/random/rng.go
index 30b611c..464b363 100644
--- a/crypto/random/rng.go
+++ b/crypto/random/rng.go
@@ -9,8 +9,8 @@ import (
"github.com/aead/serpent"
"github.com/seehuhn/fortuna"
- "github.com/Safing/portbase/config"
- "github.com/Safing/portbase/modules"
+ "github.com/safing/portbase/config"
+ "github.com/safing/portbase/modules"
)
var (
diff --git a/crypto/random/rng_test.go b/crypto/random/rng_test.go
index aa3c0c9..3bfa3e6 100644
--- a/crypto/random/rng_test.go
+++ b/crypto/random/rng_test.go
@@ -3,7 +3,7 @@ package random
import (
"testing"
- "github.com/Safing/portbase/config"
+ "github.com/safing/portbase/config"
)
func init() {
diff --git a/crypto/random/test/main.go b/crypto/random/test/main.go
index 3c3af2b..d333fbf 100644
--- a/crypto/random/test/main.go
+++ b/crypto/random/test/main.go
@@ -12,7 +12,7 @@ import (
"runtime"
"time"
- "github.com/Safing/portbase/crypto/random"
+ "github.com/safing/portbase/crypto/random"
)
func noise() {
diff --git a/database/accessor/accessor_test.go b/database/accessor/accessor_test.go
index aab5137..9190818 100644
--- a/database/accessor/accessor_test.go
+++ b/database/accessor/accessor_test.go
@@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"
- "github.com/Safing/portbase/utils"
+ "github.com/safing/portbase/utils"
)
type TestStruct struct {
diff --git a/database/boilerplate_test.go b/database/boilerplate_test.go
index 3fd5dac..c2a717e 100644
--- a/database/boilerplate_test.go
+++ b/database/boilerplate_test.go
@@ -4,7 +4,7 @@ import (
"fmt"
"sync"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/record"
)
type Example struct {
diff --git a/database/controller.go b/database/controller.go
index c34b3c7..e01162b 100644
--- a/database/controller.go
+++ b/database/controller.go
@@ -5,10 +5,10 @@ import (
"github.com/tevino/abool"
- "github.com/Safing/portbase/database/iterator"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
- "github.com/Safing/portbase/database/storage"
+ "github.com/safing/portbase/database/iterator"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
+ "github.com/safing/portbase/database/storage"
)
// A Controller takes care of all the extra database logic.
diff --git a/database/controllers.go b/database/controllers.go
index b4cc50b..3c7a344 100644
--- a/database/controllers.go
+++ b/database/controllers.go
@@ -5,7 +5,7 @@ import (
"fmt"
"sync"
- "github.com/Safing/portbase/database/storage"
+ "github.com/safing/portbase/database/storage"
)
var (
diff --git a/database/database_test.go b/database/database_test.go
index 388a25c..25c2896 100644
--- a/database/database_test.go
+++ b/database/database_test.go
@@ -10,10 +10,10 @@ import (
"testing"
"time"
- q "github.com/Safing/portbase/database/query"
- _ "github.com/Safing/portbase/database/storage/badger"
- _ "github.com/Safing/portbase/database/storage/bbolt"
- _ "github.com/Safing/portbase/database/storage/fstree"
+ q "github.com/safing/portbase/database/query"
+ _ "github.com/safing/portbase/database/storage/badger"
+ _ "github.com/safing/portbase/database/storage/bbolt"
+ _ "github.com/safing/portbase/database/storage/fstree"
)
func makeKey(dbName, key string) string {
diff --git a/database/dbmodule/db.go b/database/dbmodule/db.go
index 351518b..765af96 100644
--- a/database/dbmodule/db.go
+++ b/database/dbmodule/db.go
@@ -5,8 +5,8 @@ import (
"flag"
"sync"
- "github.com/Safing/portbase/database"
- "github.com/Safing/portbase/modules"
+ "github.com/safing/portbase/database"
+ "github.com/safing/portbase/modules"
)
var (
diff --git a/database/dbmodule/maintenance.go b/database/dbmodule/maintenance.go
index 0c403cb..1635a20 100644
--- a/database/dbmodule/maintenance.go
+++ b/database/dbmodule/maintenance.go
@@ -3,8 +3,8 @@ package dbmodule
import (
"time"
- "github.com/Safing/portbase/database"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/database"
+ "github.com/safing/portbase/log"
)
var (
diff --git a/database/hook.go b/database/hook.go
index 1edac94..c4074ab 100644
--- a/database/hook.go
+++ b/database/hook.go
@@ -1,8 +1,8 @@
package database
import (
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
)
// Hook describes a hook
diff --git a/database/hookbase.go b/database/hookbase.go
index fd42748..e89c3cc 100644
--- a/database/hookbase.go
+++ b/database/hookbase.go
@@ -1,7 +1,7 @@
package database
import (
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/record"
)
// HookBase implements the Hook interface and provides dummy functions to reduce boilerplate.
diff --git a/database/interface.go b/database/interface.go
index 12a0f17..112debf 100644
--- a/database/interface.go
+++ b/database/interface.go
@@ -7,10 +7,10 @@ import (
"github.com/bluele/gcache"
- "github.com/Safing/portbase/database/accessor"
- "github.com/Safing/portbase/database/iterator"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/iterator"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
)
const (
diff --git a/database/iterator/iterator.go b/database/iterator/iterator.go
index 6abf766..2ac5366 100644
--- a/database/iterator/iterator.go
+++ b/database/iterator/iterator.go
@@ -5,7 +5,7 @@ import (
"github.com/tevino/abool"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/record"
)
// Iterator defines the iterator structure.
diff --git a/database/maintenance.go b/database/maintenance.go
index afce639..9880b0f 100644
--- a/database/maintenance.go
+++ b/database/maintenance.go
@@ -3,8 +3,8 @@ package database
import (
"time"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
)
// Maintain runs the Maintain method on all storages.
diff --git a/database/query/condition-and.go b/database/query/condition-and.go
index 74304b9..95948b6 100644
--- a/database/query/condition-and.go
+++ b/database/query/condition-and.go
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
// And combines multiple conditions with a logical _AND_ operator.
diff --git a/database/query/condition-bool.go b/database/query/condition-bool.go
index 834b592..6136546 100644
--- a/database/query/condition-bool.go
+++ b/database/query/condition-bool.go
@@ -5,7 +5,7 @@ import (
"fmt"
"strconv"
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
type boolCondition struct {
diff --git a/database/query/condition-error.go b/database/query/condition-error.go
index a46c36b..54675ee 100644
--- a/database/query/condition-error.go
+++ b/database/query/condition-error.go
@@ -1,7 +1,7 @@
package query
import (
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
type errorCondition struct {
diff --git a/database/query/condition-exists.go b/database/query/condition-exists.go
index 567360f..a373d0b 100644
--- a/database/query/condition-exists.go
+++ b/database/query/condition-exists.go
@@ -4,7 +4,7 @@ import (
"errors"
"fmt"
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
type existsCondition struct {
diff --git a/database/query/condition-float.go b/database/query/condition-float.go
index 4416594..c140bd7 100644
--- a/database/query/condition-float.go
+++ b/database/query/condition-float.go
@@ -5,7 +5,7 @@ import (
"fmt"
"strconv"
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
type floatCondition struct {
diff --git a/database/query/condition-int.go b/database/query/condition-int.go
index dccac28..a177a25 100644
--- a/database/query/condition-int.go
+++ b/database/query/condition-int.go
@@ -5,7 +5,7 @@ import (
"fmt"
"strconv"
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
type intCondition struct {
diff --git a/database/query/condition-not.go b/database/query/condition-not.go
index cac04a7..fd1b539 100644
--- a/database/query/condition-not.go
+++ b/database/query/condition-not.go
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
// Not negates the supplied condition.
diff --git a/database/query/condition-or.go b/database/query/condition-or.go
index 25fd37b..45dffde 100644
--- a/database/query/condition-or.go
+++ b/database/query/condition-or.go
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
// Or combines multiple conditions with a logical _OR_ operator.
diff --git a/database/query/condition-regex.go b/database/query/condition-regex.go
index e808fcd..21bebe8 100644
--- a/database/query/condition-regex.go
+++ b/database/query/condition-regex.go
@@ -5,7 +5,7 @@ import (
"fmt"
"regexp"
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
type regexCondition struct {
diff --git a/database/query/condition-string.go b/database/query/condition-string.go
index ddbf1b1..f040324 100644
--- a/database/query/condition-string.go
+++ b/database/query/condition-string.go
@@ -5,7 +5,7 @@ import (
"fmt"
"strings"
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
type stringCondition struct {
diff --git a/database/query/condition-stringslice.go b/database/query/condition-stringslice.go
index ffc6643..5bdd168 100644
--- a/database/query/condition-stringslice.go
+++ b/database/query/condition-stringslice.go
@@ -4,8 +4,8 @@ import (
"fmt"
"strings"
- "github.com/Safing/portbase/database/accessor"
- "github.com/Safing/portbase/utils"
+ "github.com/safing/portbase/database/accessor"
+ "github.com/safing/portbase/utils"
)
type stringSliceCondition struct {
diff --git a/database/query/condition.go b/database/query/condition.go
index 52f4e89..33b8e59 100644
--- a/database/query/condition.go
+++ b/database/query/condition.go
@@ -3,7 +3,7 @@ package query
import (
"fmt"
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
// Condition is an interface to provide a common api to all condition types.
diff --git a/database/query/query.go b/database/query/query.go
index 88f7f5c..bc576ca 100644
--- a/database/query/query.go
+++ b/database/query/query.go
@@ -4,8 +4,8 @@ import (
"fmt"
"strings"
- "github.com/Safing/portbase/database/accessor"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/record"
)
// Example:
diff --git a/database/query/query_test.go b/database/query/query_test.go
index 1730381..b00e9ea 100644
--- a/database/query/query_test.go
+++ b/database/query/query_test.go
@@ -3,8 +3,8 @@ package query
import (
"testing"
- "github.com/Safing/portbase/database/record"
- "github.com/Safing/portbase/formats/dsd"
+ "github.com/safing/portbase/database/record"
+ "github.com/safing/portbase/formats/dsd"
)
var (
diff --git a/database/record/base.go b/database/record/base.go
index 6328437..1f97a42 100644
--- a/database/record/base.go
+++ b/database/record/base.go
@@ -4,9 +4,9 @@ import (
"errors"
"fmt"
- "github.com/Safing/portbase/container"
- "github.com/Safing/portbase/database/accessor"
- "github.com/Safing/portbase/formats/dsd"
+ "github.com/safing/portbase/container"
+ "github.com/safing/portbase/database/accessor"
+ "github.com/safing/portbase/formats/dsd"
)
// Base provides a quick way to comply with the Model interface.
diff --git a/database/record/formats.go b/database/record/formats.go
index d453337..b09c0e6 100644
--- a/database/record/formats.go
+++ b/database/record/formats.go
@@ -1,7 +1,7 @@
package record
import (
- "github.com/Safing/portbase/formats/dsd"
+ "github.com/safing/portbase/formats/dsd"
)
// Reimport DSD storage types
diff --git a/database/record/meta-bench_test.go b/database/record/meta-bench_test.go
index ca845c6..a531693 100644
--- a/database/record/meta-bench_test.go
+++ b/database/record/meta-bench_test.go
@@ -21,11 +21,11 @@ import (
"testing"
"time"
- "github.com/Safing/portbase/container"
- "github.com/Safing/portbase/formats/dsd"
- "github.com/Safing/portbase/formats/varint"
+ "github.com/safing/portbase/container"
+ "github.com/safing/portbase/formats/dsd"
+ "github.com/safing/portbase/formats/varint"
// Colfer
- // "github.com/Safing/portbase/database/model/model"
+ // "github.com/safing/portbase/database/model/model"
// XDR
// xdr2 "github.com/davecgh/go-xdr/xdr2"
)
diff --git a/database/record/record.go b/database/record/record.go
index 3733745..850e65c 100644
--- a/database/record/record.go
+++ b/database/record/record.go
@@ -1,7 +1,7 @@
package record
import (
- "github.com/Safing/portbase/database/accessor"
+ "github.com/safing/portbase/database/accessor"
)
// Record provides an interface for uniformally handling database records.
diff --git a/database/record/wrapper.go b/database/record/wrapper.go
index 03c46bc..66768ef 100644
--- a/database/record/wrapper.go
+++ b/database/record/wrapper.go
@@ -5,10 +5,10 @@ import (
"fmt"
"sync"
- "github.com/Safing/portbase/container"
- "github.com/Safing/portbase/database/accessor"
- "github.com/Safing/portbase/formats/dsd"
- "github.com/Safing/portbase/formats/varint"
+ "github.com/safing/portbase/container"
+ "github.com/safing/portbase/database/accessor"
+ "github.com/safing/portbase/formats/dsd"
+ "github.com/safing/portbase/formats/varint"
)
// Wrapper wraps raw data and implements the Record interface.
diff --git a/database/record/wrapper_test.go b/database/record/wrapper_test.go
index 0e14156..83d72ae 100644
--- a/database/record/wrapper_test.go
+++ b/database/record/wrapper_test.go
@@ -4,7 +4,7 @@ import (
"bytes"
"testing"
- "github.com/Safing/portbase/formats/dsd"
+ "github.com/safing/portbase/formats/dsd"
)
func TestWrapper(t *testing.T) {
diff --git a/database/storage/badger/badger.go b/database/storage/badger/badger.go
index 5670124..594463d 100644
--- a/database/storage/badger/badger.go
+++ b/database/storage/badger/badger.go
@@ -7,11 +7,11 @@ import (
"github.com/dgraph-io/badger"
- "github.com/Safing/portbase/database/iterator"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
- "github.com/Safing/portbase/database/storage"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/database/iterator"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
+ "github.com/safing/portbase/database/storage"
+ "github.com/safing/portbase/log"
)
// Badger database made pluggable for portbase.
diff --git a/database/storage/badger/badger_test.go b/database/storage/badger/badger_test.go
index f8891d3..17fd971 100644
--- a/database/storage/badger/badger_test.go
+++ b/database/storage/badger/badger_test.go
@@ -7,8 +7,8 @@ import (
"sync"
"testing"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
)
type TestRecord struct {
diff --git a/database/storage/bbolt/bbolt.go b/database/storage/bbolt/bbolt.go
index fcb9b56..c1d487b 100644
--- a/database/storage/bbolt/bbolt.go
+++ b/database/storage/bbolt/bbolt.go
@@ -9,10 +9,10 @@ import (
"go.etcd.io/bbolt"
- "github.com/Safing/portbase/database/iterator"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
- "github.com/Safing/portbase/database/storage"
+ "github.com/safing/portbase/database/iterator"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
+ "github.com/safing/portbase/database/storage"
)
var (
diff --git a/database/storage/bbolt/bbolt_test.go b/database/storage/bbolt/bbolt_test.go
index d19a17d..8d8043f 100644
--- a/database/storage/bbolt/bbolt_test.go
+++ b/database/storage/bbolt/bbolt_test.go
@@ -7,8 +7,8 @@ import (
"sync"
"testing"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
)
type TestRecord struct {
diff --git a/database/storage/fstree/fstree.go b/database/storage/fstree/fstree.go
index d5b7a4d..cdd16a7 100644
--- a/database/storage/fstree/fstree.go
+++ b/database/storage/fstree/fstree.go
@@ -13,10 +13,10 @@ import (
"strings"
"time"
- "github.com/Safing/portbase/database/iterator"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
- "github.com/Safing/portbase/database/storage"
+ "github.com/safing/portbase/database/iterator"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
+ "github.com/safing/portbase/database/storage"
"github.com/google/renameio"
)
diff --git a/database/storage/injectbase.go b/database/storage/injectbase.go
index 1d3a734..316c8d6 100644
--- a/database/storage/injectbase.go
+++ b/database/storage/injectbase.go
@@ -3,9 +3,9 @@ package storage
import (
"errors"
- "github.com/Safing/portbase/database/iterator"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/iterator"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
)
var (
diff --git a/database/storage/interface.go b/database/storage/interface.go
index 73b1a5f..4a6ce1e 100644
--- a/database/storage/interface.go
+++ b/database/storage/interface.go
@@ -1,9 +1,9 @@
package storage
import (
- "github.com/Safing/portbase/database/iterator"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/iterator"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
)
// Interface defines the database storage API.
diff --git a/database/storage/sinkhole/sinkhole.go b/database/storage/sinkhole/sinkhole.go
index b1447a7..c1b0f06 100644
--- a/database/storage/sinkhole/sinkhole.go
+++ b/database/storage/sinkhole/sinkhole.go
@@ -3,10 +3,10 @@ package sinkhole
import (
"errors"
- "github.com/Safing/portbase/database/iterator"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
- "github.com/Safing/portbase/database/storage"
+ "github.com/safing/portbase/database/iterator"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
+ "github.com/safing/portbase/database/storage"
)
// Sinkhole is a dummy storage.
diff --git a/database/subscription.go b/database/subscription.go
index 478ed96..6d29b7e 100644
--- a/database/subscription.go
+++ b/database/subscription.go
@@ -1,8 +1,8 @@
package database
import (
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
)
// Subscription is a database subscription for updates.
diff --git a/formats/dsd/dsd.go b/formats/dsd/dsd.go
index 41dd3d9..2513323 100644
--- a/formats/dsd/dsd.go
+++ b/formats/dsd/dsd.go
@@ -12,7 +12,7 @@ import (
// "github.com/pkg/bson"
- "github.com/Safing/portbase/formats/varint"
+ "github.com/safing/portbase/formats/varint"
)
// define types
diff --git a/info/flags.go b/info/flags.go
index 3e76f1b..7c4ae2b 100644
--- a/info/flags.go
+++ b/info/flags.go
@@ -7,7 +7,7 @@ import (
"os"
"strings"
- "github.com/Safing/portbase/modules"
+ "github.com/safing/portbase/modules"
)
var (
diff --git a/log/formatting_windows.go b/log/formatting_windows.go
index 2889321..c78cef1 100644
--- a/log/formatting_windows.go
+++ b/log/formatting_windows.go
@@ -1,7 +1,7 @@
package log
import (
- "github.com/Safing/portbase/utils/osdetail"
+ "github.com/safing/portbase/utils/osdetail"
)
const (
diff --git a/log/output.go b/log/output.go
index 5c71c1f..abce8b0 100644
--- a/log/output.go
+++ b/log/output.go
@@ -6,7 +6,7 @@ import (
"fmt"
"time"
- "github.com/Safing/portbase/taskmanager"
+ "github.com/safing/portbase/taskmanager"
)
func writeLine(line *logLine, duplicates uint64) {
diff --git a/modules/start.go b/modules/start.go
index 01836a3..8d6ae88 100644
--- a/modules/start.go
+++ b/modules/start.go
@@ -4,7 +4,7 @@ import (
"fmt"
"os"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/log"
"github.com/tevino/abool"
)
diff --git a/modules/stop.go b/modules/stop.go
index d8295e1..9bb90b0 100644
--- a/modules/stop.go
+++ b/modules/stop.go
@@ -6,7 +6,7 @@ import (
"github.com/tevino/abool"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/log"
)
var (
diff --git a/notifications/database.go b/notifications/database.go
index e09bb76..9779aae 100644
--- a/notifications/database.go
+++ b/notifications/database.go
@@ -6,12 +6,12 @@ import (
"strings"
"sync"
- "github.com/Safing/portbase/database"
- "github.com/Safing/portbase/database/iterator"
- "github.com/Safing/portbase/database/query"
- "github.com/Safing/portbase/database/record"
- "github.com/Safing/portbase/database/storage"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/database"
+ "github.com/safing/portbase/database/iterator"
+ "github.com/safing/portbase/database/query"
+ "github.com/safing/portbase/database/record"
+ "github.com/safing/portbase/database/storage"
+ "github.com/safing/portbase/log"
)
var (
diff --git a/notifications/module.go b/notifications/module.go
index f8599ae..21e5997 100644
--- a/notifications/module.go
+++ b/notifications/module.go
@@ -3,7 +3,7 @@ package notifications
import (
"sync"
- "github.com/Safing/portbase/modules"
+ "github.com/safing/portbase/modules"
)
var (
diff --git a/notifications/notification.go b/notifications/notification.go
index 4af05f8..59d28b7 100644
--- a/notifications/notification.go
+++ b/notifications/notification.go
@@ -5,8 +5,8 @@ import (
"sync"
"time"
- "github.com/Safing/portbase/database/record"
- "github.com/Safing/portbase/log"
+ "github.com/safing/portbase/database/record"
+ "github.com/safing/portbase/log"
)
// Notification types
diff --git a/portbase.go b/portbase.go
index 7f34903..d2dd1c3 100644
--- a/portbase.go
+++ b/portbase.go
@@ -6,9 +6,9 @@ import (
"os/signal"
"syscall"
- "github.com/Safing/portbase/info"
- "github.com/Safing/portbase/log"
- "github.com/Safing/portbase/modules"
+ "github.com/safing/portbase/info"
+ "github.com/safing/portbase/log"
+ "github.com/safing/portbase/modules"
// include packages here
)
diff --git a/utils/osdetail/test/main.go b/utils/osdetail/test/main.go
index f2cf4e0..c4247bd 100644
--- a/utils/osdetail/test/main.go
+++ b/utils/osdetail/test/main.go
@@ -3,7 +3,7 @@ package main
import (
"fmt"
- "github.com/Safing/portbase/utils/osdetail"
+ "github.com/safing/portbase/utils/osdetail"
)
func main() {