diff --git a/cli/daemon.go b/cli/daemon.go index e9ef1b7..407e122 100644 --- a/cli/daemon.go +++ b/cli/daemon.go @@ -5,8 +5,8 @@ import ( "net/http" "time" - "github.com/soulteary/apt-proxy/pkgs/httpcache" - "github.com/soulteary/apt-proxy/pkgs/httplog" + "github.com/soulteary/apt-proxy/pkg/httpcache" + "github.com/soulteary/apt-proxy/pkg/httplog" "github.com/soulteary/apt-proxy/server" ) diff --git a/pkgs/httpcache/LICENSE b/pkg/httpcache/LICENSE similarity index 100% rename from pkgs/httpcache/LICENSE rename to pkg/httpcache/LICENSE diff --git a/pkgs/httpcache/README.md b/pkg/httpcache/README.md similarity index 100% rename from pkgs/httpcache/README.md rename to pkg/httpcache/README.md diff --git a/pkgs/httpcache/bench_test.go b/pkg/httpcache/bench_test.go similarity index 100% rename from pkgs/httpcache/bench_test.go rename to pkg/httpcache/bench_test.go diff --git a/pkgs/httpcache/cache.go b/pkg/httpcache/cache.go similarity index 99% rename from pkgs/httpcache/cache.go rename to pkg/httpcache/cache.go index 7869ec8..a76aed1 100644 --- a/pkgs/httpcache/cache.go +++ b/pkg/httpcache/cache.go @@ -16,7 +16,7 @@ import ( "strings" "time" - "github.com/soulteary/apt-proxy/pkgs/vfs" + "github.com/soulteary/apt-proxy/pkg/vfs" ) const ( diff --git a/pkgs/httpcache/cache_test.go b/pkg/httpcache/cache_test.go similarity index 100% rename from pkgs/httpcache/cache_test.go rename to pkg/httpcache/cache_test.go diff --git a/pkgs/httpcache/cachecontrol.go b/pkg/httpcache/cachecontrol.go similarity index 100% rename from pkgs/httpcache/cachecontrol.go rename to pkg/httpcache/cachecontrol.go diff --git a/pkgs/httpcache/cachecontrol_test.go b/pkg/httpcache/cachecontrol_test.go similarity index 100% rename from pkgs/httpcache/cachecontrol_test.go rename to pkg/httpcache/cachecontrol_test.go diff --git a/pkgs/httpcache/handler.go b/pkg/httpcache/handler.go similarity index 99% rename from pkgs/httpcache/handler.go rename to pkg/httpcache/handler.go index 9da30e4..2767426 100644 --- a/pkgs/httpcache/handler.go +++ b/pkg/httpcache/handler.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/soulteary/apt-proxy/pkgs/stream.v1" + "github.com/soulteary/apt-proxy/pkg/stream.v1" ) const ( diff --git a/pkgs/httpcache/header.go b/pkg/httpcache/header.go similarity index 100% rename from pkgs/httpcache/header.go rename to pkg/httpcache/header.go diff --git a/pkgs/httpcache/key.go b/pkg/httpcache/key.go similarity index 100% rename from pkgs/httpcache/key.go rename to pkg/httpcache/key.go diff --git a/pkgs/httpcache/key_test.go b/pkg/httpcache/key_test.go similarity index 100% rename from pkgs/httpcache/key_test.go rename to pkg/httpcache/key_test.go diff --git a/pkgs/httpcache/logger.go b/pkg/httpcache/logger.go similarity index 100% rename from pkgs/httpcache/logger.go rename to pkg/httpcache/logger.go diff --git a/pkgs/httpcache/resource.go b/pkg/httpcache/resource.go similarity index 100% rename from pkgs/httpcache/resource.go rename to pkg/httpcache/resource.go diff --git a/pkgs/httpcache/spec_test.go b/pkg/httpcache/spec_test.go similarity index 99% rename from pkgs/httpcache/spec_test.go rename to pkg/httpcache/spec_test.go index bf152dd..68de439 100644 --- a/pkgs/httpcache/spec_test.go +++ b/pkg/httpcache/spec_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/soulteary/apt-proxy/pkgs/httpcache" - "github.com/soulteary/apt-proxy/pkgs/httplog" + "github.com/soulteary/apt-proxy/pkg/httpcache" + "github.com/soulteary/apt-proxy/pkg/httplog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkgs/httpcache/util_test.go b/pkg/httpcache/util_test.go similarity index 100% rename from pkgs/httpcache/util_test.go rename to pkg/httpcache/util_test.go diff --git a/pkgs/httpcache/validator.go b/pkg/httpcache/validator.go similarity index 100% rename from pkgs/httpcache/validator.go rename to pkg/httpcache/validator.go diff --git a/pkgs/httplog/log.go b/pkg/httplog/log.go similarity index 100% rename from pkgs/httplog/log.go rename to pkg/httplog/log.go diff --git a/pkgs/stream.v1/LICENSE b/pkg/stream.v1/LICENSE similarity index 100% rename from pkgs/stream.v1/LICENSE rename to pkg/stream.v1/LICENSE diff --git a/pkgs/stream.v1/README.md b/pkg/stream.v1/README.md similarity index 100% rename from pkgs/stream.v1/README.md rename to pkg/stream.v1/README.md diff --git a/pkgs/stream.v1/fs.go b/pkg/stream.v1/fs.go similarity index 100% rename from pkgs/stream.v1/fs.go rename to pkg/stream.v1/fs.go diff --git a/pkgs/stream.v1/memfs.go b/pkg/stream.v1/memfs.go similarity index 100% rename from pkgs/stream.v1/memfs.go rename to pkg/stream.v1/memfs.go diff --git a/pkgs/stream.v1/reader.go b/pkg/stream.v1/reader.go similarity index 100% rename from pkgs/stream.v1/reader.go rename to pkg/stream.v1/reader.go diff --git a/pkgs/stream.v1/stream.go b/pkg/stream.v1/stream.go similarity index 100% rename from pkgs/stream.v1/stream.go rename to pkg/stream.v1/stream.go diff --git a/pkgs/stream.v1/stream_test.go b/pkg/stream.v1/stream_test.go similarity index 100% rename from pkgs/stream.v1/stream_test.go rename to pkg/stream.v1/stream_test.go diff --git a/pkgs/stream.v1/sync.go b/pkg/stream.v1/sync.go similarity index 100% rename from pkgs/stream.v1/sync.go rename to pkg/stream.v1/sync.go diff --git a/pkgs/system/filesize.go b/pkg/system/filesize.go similarity index 100% rename from pkgs/system/filesize.go rename to pkg/system/filesize.go diff --git a/pkgs/system/gc.go b/pkg/system/gc.go similarity index 100% rename from pkgs/system/gc.go rename to pkg/system/gc.go diff --git a/pkgs/vfs/LICENSE b/pkg/vfs/LICENSE similarity index 100% rename from pkgs/vfs/LICENSE rename to pkg/vfs/LICENSE diff --git a/pkgs/vfs/README.md b/pkg/vfs/README.md similarity index 100% rename from pkgs/vfs/README.md rename to pkg/vfs/README.md diff --git a/pkgs/vfs/bench_test.go b/pkg/vfs/bench_test.go similarity index 100% rename from pkgs/vfs/bench_test.go rename to pkg/vfs/bench_test.go diff --git a/pkgs/vfs/chroot.go b/pkg/vfs/chroot.go similarity index 100% rename from pkgs/vfs/chroot.go rename to pkg/vfs/chroot.go diff --git a/pkgs/vfs/doc.go b/pkg/vfs/doc.go similarity index 100% rename from pkgs/vfs/doc.go rename to pkg/vfs/doc.go diff --git a/pkgs/vfs/file.go b/pkg/vfs/file.go similarity index 100% rename from pkgs/vfs/file.go rename to pkg/vfs/file.go diff --git a/pkgs/vfs/file_util.go b/pkg/vfs/file_util.go similarity index 100% rename from pkgs/vfs/file_util.go rename to pkg/vfs/file_util.go diff --git a/pkgs/vfs/fs.go b/pkg/vfs/fs.go similarity index 100% rename from pkgs/vfs/fs.go rename to pkg/vfs/fs.go diff --git a/pkgs/vfs/map.go b/pkg/vfs/map.go similarity index 100% rename from pkgs/vfs/map.go rename to pkg/vfs/map.go diff --git a/pkgs/vfs/mem.go b/pkg/vfs/mem.go similarity index 100% rename from pkgs/vfs/mem.go rename to pkg/vfs/mem.go diff --git a/pkgs/vfs/mounter.go b/pkg/vfs/mounter.go similarity index 100% rename from pkgs/vfs/mounter.go rename to pkg/vfs/mounter.go diff --git a/pkgs/vfs/open.go b/pkg/vfs/open.go similarity index 100% rename from pkgs/vfs/open.go rename to pkg/vfs/open.go diff --git a/pkgs/vfs/open_test.go b/pkg/vfs/open_test.go similarity index 100% rename from pkgs/vfs/open_test.go rename to pkg/vfs/open_test.go diff --git a/pkgs/vfs/rewriter.go b/pkg/vfs/rewriter.go similarity index 100% rename from pkgs/vfs/rewriter.go rename to pkg/vfs/rewriter.go diff --git a/pkgs/vfs/ro.go b/pkg/vfs/ro.go similarity index 100% rename from pkgs/vfs/ro.go rename to pkg/vfs/ro.go diff --git a/pkgs/vfs/testdata/download-data.sh b/pkg/vfs/testdata/download-data.sh similarity index 100% rename from pkgs/vfs/testdata/download-data.sh rename to pkg/vfs/testdata/download-data.sh diff --git a/pkgs/vfs/testdata/fs.tar b/pkg/vfs/testdata/fs.tar similarity index 100% rename from pkgs/vfs/testdata/fs.tar rename to pkg/vfs/testdata/fs.tar diff --git a/pkgs/vfs/testdata/fs.tar.bz2 b/pkg/vfs/testdata/fs.tar.bz2 similarity index 100% rename from pkgs/vfs/testdata/fs.tar.bz2 rename to pkg/vfs/testdata/fs.tar.bz2 diff --git a/pkgs/vfs/testdata/fs.tar.gz b/pkg/vfs/testdata/fs.tar.gz similarity index 100% rename from pkgs/vfs/testdata/fs.tar.gz rename to pkg/vfs/testdata/fs.tar.gz diff --git a/pkgs/vfs/testdata/fs.zip b/pkg/vfs/testdata/fs.zip similarity index 100% rename from pkgs/vfs/testdata/fs.zip rename to pkg/vfs/testdata/fs.zip diff --git a/pkgs/vfs/testdata/fs/a/b/c/d b/pkg/vfs/testdata/fs/a/b/c/d similarity index 100% rename from pkgs/vfs/testdata/fs/a/b/c/d rename to pkg/vfs/testdata/fs/a/b/c/d diff --git a/pkgs/vfs/testdata/fs/empty b/pkg/vfs/testdata/fs/empty similarity index 100% rename from pkgs/vfs/testdata/fs/empty rename to pkg/vfs/testdata/fs/empty diff --git a/pkgs/vfs/testdata/update-fs.sh b/pkg/vfs/testdata/update-fs.sh similarity index 100% rename from pkgs/vfs/testdata/update-fs.sh rename to pkg/vfs/testdata/update-fs.sh diff --git a/pkgs/vfs/util.go b/pkg/vfs/util.go similarity index 100% rename from pkgs/vfs/util.go rename to pkg/vfs/util.go diff --git a/pkgs/vfs/vfs.go b/pkg/vfs/vfs.go similarity index 100% rename from pkgs/vfs/vfs.go rename to pkg/vfs/vfs.go diff --git a/pkgs/vfs/vfs_test.go b/pkg/vfs/vfs_test.go similarity index 100% rename from pkgs/vfs/vfs_test.go rename to pkg/vfs/vfs_test.go diff --git a/pkgs/vfs/write.go b/pkg/vfs/write.go similarity index 100% rename from pkgs/vfs/write.go rename to pkg/vfs/write.go diff --git a/pkgs/vfs/write_test.go b/pkg/vfs/write_test.go similarity index 100% rename from pkgs/vfs/write_test.go rename to pkg/vfs/write_test.go diff --git a/server/internal.go b/server/internal.go index bded480..5d9d1d2 100644 --- a/server/internal.go +++ b/server/internal.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/soulteary/apt-proxy/pkgs/system" + "github.com/soulteary/apt-proxy/pkg/system" ) const (