diff --git a/.travis.yml b/.travis.yml index e24878d0..43984199 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ stages: - release cache: directories: - - vendor - lib/rice-box.go jobs: include: diff --git a/build/build.sh b/build/build.sh index eeb4411b..9e3c099c 100755 --- a/build/build.sh +++ b/build/build.sh @@ -4,7 +4,7 @@ set -e cd $(dirname $0)/../cli -dep ensure -vendor-only +go get -v ./... if [ "$COMMIT_SHA" != "" ]; then echo "Set version to ($COMMIT_SHA)" diff --git a/build/run_gometalinter.sh b/build/run_gometalinter.sh index 5a755181..a90ba71c 100755 --- a/build/run_gometalinter.sh +++ b/build/run_gometalinter.sh @@ -8,7 +8,7 @@ dolint='gometalinter --exclude="rice-box.go" --exclude="vendor" --deadline=300s if [ "$USE_DOCKER" != "" ]; then docker run --rm -itv $(pwd):/src filebrowser/dev sh -c "\ - cp -r /src/. ./ && cd cli && dep ensure -v -vendor-only && \ + cp -r /src/. ./ && cd cli && go get -v ./... && \ CGO_ENABLED=0 $dolint" else $dolint diff --git a/cli/Gopkg.lock b/cli/Gopkg.lock deleted file mode 100644 index 08c8d86e..00000000 --- a/cli/Gopkg.lock +++ /dev/null @@ -1,423 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - branch = "master" - digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761" - name = "github.com/BurntSushi/toml" - packages = ["."] - pruneopts = "UT" - revision = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005" - -[[projects]] - branch = "master" - digest = "1:65796e5fdb94d94bc0ee6bc422aa3541dbe69ed4da275cb5a27f8fa141f4e35c" - name = "github.com/GeertJohan/go.rice" - packages = [ - ".", - "embedded", - ] - pruneopts = "UT" - revision = "c02ca9a983da5807ddf7d796784928f5be4afd09" - -[[projects]] - digest = "1:9ede7940cd19ac5d92896381abac71954feb57608b617152e48112c3dc667e87" - name = "github.com/asdine/storm" - packages = [ - ".", - "codec", - "codec/json", - "index", - "internal", - "q", - ] - pruneopts = "UT" - revision = "bda68dab90fc908ee5dbccb36400edf4f54972d6" - version = "v2.1.1" - -[[projects]] - digest = "1:68eae87f8e5391e83ed2f7568e727709c598672f9c8390460241dcc1c2db2d34" - name = "github.com/chaseadamsio/goorgeous" - packages = ["."] - pruneopts = "UT" - revision = "dcf1ef873b8987bf12596fe6951c48347986eb2f" - version = "v1.1.0" - -[[projects]] - digest = "1:c28625428387b63dd7154eb857f51e700465cfbf7c06f619e71f2da33cefe47e" - name = "github.com/coreos/bbolt" - packages = ["."] - pruneopts = "UT" - revision = "583e8937c61f1af6513608ccc75c97b6abdf4ff9" - version = "v1.3.0" - -[[projects]] - branch = "master" - digest = "1:5fd5c4d4282935b7a575299494f2c09e9d2cacded7815c83aff7c1602aff3154" - name = "github.com/daaku/go.zipexe" - packages = ["."] - pruneopts = "UT" - revision = "a5fe2436ffcb3236e175e5149162b41cd28bd27d" - -[[projects]] - digest = "1:bb2130e54ac8ea3ff78312ca365ce3b8a23423ed362530551bdceaccfa4d8e77" - name = "github.com/dgrijalva/jwt-go" - packages = [ - ".", - "request", - ] - pruneopts = "UT" - revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" - version = "v3.2.0" - -[[projects]] - branch = "master" - digest = "1:988cfde37f089c50ba1ac8a1032c3f81d2ac0359e1872093b946a30139665eb6" - name = "github.com/dsnet/compress" - packages = [ - ".", - "bzip2", - "bzip2/internal/sais", - "internal", - "internal/errors", - "internal/prefix", - ] - pruneopts = "UT" - revision = "cc9eb1d7ad760af14e8f918698f745e80377af4f" - -[[projects]] - branch = "feat/use-cobra" - digest = "1:fbcec030a49eda4de3df0b74adba0c98616cdd7591de04ecec75d348cf1b7c0c" - name = "github.com/filebrowser/filebrowser" - packages = [ - "lib", - "lib/bolt", - "lib/http", - "lib/staticgen", - ] - pruneopts = "UT" - revision = "49748d85004e38d1f0be069f749eedafb1edd312" - -[[projects]] - branch = "master" - digest = "1:50a46ab1d5edbbdd55125b4d37f1bf503d0807c26461f9ad7b358d6006641d09" - name = "github.com/flynn/go-shlex" - packages = ["."] - pruneopts = "UT" - revision = "3f9db97f856818214da2e1057f8ad84803971cff" - -[[projects]] - digest = "1:abeb38ade3f32a92943e5be54f55ed6d6e3b6602761d74b4aab4c9dd45c18abd" - name = "github.com/fsnotify/fsnotify" - packages = ["."] - pruneopts = "UT" - revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" - version = "v1.4.7" - -[[projects]] - digest = "1:402c1a5e502d338e285ade7820bcd7bc6d860a262e1809eee5b1c34ef7692627" - name = "github.com/gohugoio/hugo" - packages = ["parser"] - pruneopts = "UT" - revision = "25e88ccabe9b04c42ffb43528c86743f623fac46" - version = "v0.36.1" - -[[projects]] - branch = "master" - digest = "1:4a0c6bb4805508a6287675fac876be2ac1182539ca8a32468d8128882e9d5009" - name = "github.com/golang/snappy" - packages = ["."] - pruneopts = "UT" - revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a" - -[[projects]] - digest = "1:43dd08a10854b2056e615d1b1d22ac94559d822e1f8b6fcc92c1a1057e85188e" - name = "github.com/gorilla/websocket" - packages = ["."] - pruneopts = "UT" - revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b" - version = "v1.2.0" - -[[projects]] - branch = "master" - digest = "1:837e92fe1b970f26d25d35c755106d86ba45717d11374c4f344654baa4add7b3" - name = "github.com/hacdias/fileutils" - packages = ["."] - pruneopts = "UT" - revision = "76b1c6ab906773727a1ce2f7fb22830685166f85" - -[[projects]] - branch = "master" - digest = "1:a6c3d669d54b94899aa207bb3da0a38f4d3054e396a80cae2ed7634e2843c1ba" - name = "github.com/hacdias/varutils" - packages = ["."] - pruneopts = "UT" - revision = "82d3b57f667a756cfc4b1535951b46878881f3e1" - -[[projects]] - branch = "master" - digest = "1:a361611b8c8c75a1091f00027767f7779b29cb37c456a71b8f2604c88057ab40" - name = "github.com/hashicorp/hcl" - packages = [ - ".", - "hcl/ast", - "hcl/parser", - "hcl/printer", - "hcl/scanner", - "hcl/strconv", - "hcl/token", - "json/parser", - "json/scanner", - "json/token", - ] - pruneopts = "UT" - revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168" - -[[projects]] - digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" - name = "github.com/inconshreveable/mousetrap" - packages = ["."] - pruneopts = "UT" - revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" - version = "v1.0" - -[[projects]] - branch = "master" - digest = "1:caf6db28595425c0e0f2301a00257d11712f65c1878e12cffc42f6b9a9cf3f23" - name = "github.com/kardianos/osext" - packages = ["."] - pruneopts = "UT" - revision = "ae77be60afb1dcacde03767a8c37337fad28ac14" - -[[projects]] - digest = "1:c568d7727aa262c32bdf8a3f7db83614f7af0ed661474b24588de635c20024c7" - name = "github.com/magiconair/properties" - packages = ["."] - pruneopts = "UT" - revision = "c2353362d570a7bfa228149c62842019201cfb71" - version = "v1.8.0" - -[[projects]] - branch = "master" - digest = "1:4bceeb937bfdd1fc2c545c685c43fdad909d78508b308b318e79db6b8fd6c792" - name = "github.com/maruel/natural" - packages = ["."] - pruneopts = "UT" - revision = "dbcb3e2e8cf10eb839718ba666ef1e21b1c8b847" - -[[projects]] - digest = "1:f17bcb6a3694fe34b29fa9f0d93e1984450f6854b66c2df49524ba9541f9952d" - name = "github.com/mholt/archiver" - packages = ["."] - pruneopts = "UT" - revision = "26cf5bb32d07aa4e8d0de15f56ce516f4641d7df" - -[[projects]] - digest = "1:fa577f7189e08bb551a16f655bb53ef27e1bebf0280e523f651eeced0cd98514" - name = "github.com/mholt/caddy" - packages = [ - ".", - "caddyfile", - ] - pruneopts = "UT" - revision = "2922d09bef3c504dde66bc12f7441668fcef6a20" - version = "v0.10.14" - -[[projects]] - branch = "master" - digest = "1:c7354463195544b1ab3c1f1fadb41430947f5d28dfbf2cdbd38268c5717a5a03" - name = "github.com/mitchellh/go-homedir" - packages = ["."] - pruneopts = "UT" - revision = "58046073cbffe2f25d425fe1331102f55cf719de" - -[[projects]] - branch = "master" - digest = "1:5ab79470a1d0fb19b041a624415612f8236b3c06070161a910562f2b2d064355" - name = "github.com/mitchellh/mapstructure" - packages = ["."] - pruneopts = "UT" - revision = "f15292f7a699fcc1a38a80977f80a046874ba8ac" - -[[projects]] - branch = "master" - digest = "1:3bdb4203c03569a564d6a4bd54d84315575cebb2d76471f8676f8ee8c402005e" - name = "github.com/nwaples/rardecode" - packages = ["."] - pruneopts = "UT" - revision = "e06696f847aeda6f39a8f0b7cdff193b7690aef6" - -[[projects]] - digest = "1:95741de3af260a92cc5c7f3f3061e85273f5a81b5db20d4bd68da74bd521675e" - name = "github.com/pelletier/go-toml" - packages = ["."] - pruneopts = "UT" - revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194" - version = "v1.2.0" - -[[projects]] - digest = "1:29803f52611cbcc1dfe55b456e9fdac362af7248b3d29d7ea1bec0a12e71dff4" - name = "github.com/pierrec/lz4" - packages = [ - ".", - "internal/xxh32", - ] - pruneopts = "UT" - revision = "1958fd8fff7f115e79725b1288e0b878b3e06b00" - version = "v2.0.3" - -[[projects]] - digest = "1:ed615c5430ecabbb0fb7629a182da65ecee6523900ac1ac932520860878ffcad" - name = "github.com/robfig/cron" - packages = ["."] - pruneopts = "UT" - revision = "b41be1df696709bb6395fe435af20370037c0b4c" - version = "v1.1" - -[[projects]] - digest = "1:39c2113f3a89585666e6f973650cff186b2d06deb4aa202c88addb87b0a201db" - name = "github.com/russross/blackfriday" - packages = ["."] - pruneopts = "UT" - revision = "cadec560ec52d93835bf2f15bd794700d3a2473b" - version = "v2.0.0" - -[[projects]] - branch = "master" - digest = "1:def689e73e9252f6f7fe66834a76751a41b767e03daab299e607e7226c58a855" - name = "github.com/shurcooL/sanitized_anchor_name" - packages = ["."] - pruneopts = "UT" - revision = "86672fcb3f950f35f2e675df2240550f2a50762f" - -[[projects]] - digest = "1:bd1ae00087d17c5a748660b8e89e1043e1e5479d0fea743352cda2f8dd8c4f84" - name = "github.com/spf13/afero" - packages = [ - ".", - "mem", - ] - pruneopts = "UT" - revision = "787d034dfe70e44075ccc060d346146ef53270ad" - version = "v1.1.1" - -[[projects]] - digest = "1:516e71bed754268937f57d4ecb190e01958452336fa73dbac880894164e91c1f" - name = "github.com/spf13/cast" - packages = ["."] - pruneopts = "UT" - revision = "8965335b8c7107321228e3e3702cab9832751bac" - version = "v1.2.0" - -[[projects]] - digest = "1:645cabccbb4fa8aab25a956cbcbdf6a6845ca736b2c64e197ca7cbb9d210b939" - name = "github.com/spf13/cobra" - packages = ["."] - pruneopts = "UT" - revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" - version = "v0.0.3" - -[[projects]] - branch = "master" - digest = "1:8a020f916b23ff574845789daee6818daf8d25a4852419aae3f0b12378ba432a" - name = "github.com/spf13/jwalterweatherman" - packages = ["."] - pruneopts = "UT" - revision = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2" - -[[projects]] - digest = "1:dab83a1bbc7ad3d7a6ba1a1cc1760f25ac38cdf7d96a5cdd55cd915a4f5ceaf9" - name = "github.com/spf13/pflag" - packages = ["."] - pruneopts = "UT" - revision = "9a97c102cda95a86cec2345a6f09f55a939babf5" - version = "v1.0.2" - -[[projects]] - digest = "1:4fc8a61287ccfb4286e1ca5ad2ce3b0b301d746053bf44ac38cf34e40ae10372" - name = "github.com/spf13/viper" - packages = ["."] - pruneopts = "UT" - revision = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9" - version = "v1.1.0" - -[[projects]] - digest = "1:4aeb3860275fa1fd60cccfb5a6ef85da438bf17402e1e84412ade4d4b55066a0" - name = "github.com/ulikunitz/xz" - packages = [ - ".", - "internal/hash", - "internal/xlog", - "lzma", - ] - pruneopts = "UT" - revision = "0c6b41e72360850ca4f98dc341fd999726ea007f" - version = "v0.5.4" - -[[projects]] - branch = "master" - digest = "1:1ecf2a49df33be51e757d0033d5d51d5f784f35f68e5a38f797b2d3f03357d71" - name = "golang.org/x/crypto" - packages = [ - "bcrypt", - "blowfish", - ] - pruneopts = "UT" - revision = "aabede6cba87e37f413b3e60ebfc214f8eeca1b0" - -[[projects]] - branch = "master" - digest = "1:05662433b3a13c921587a6e622b5722072edff83211efd1cd79eeaeedfd83f07" - name = "golang.org/x/sys" - packages = ["unix"] - pruneopts = "UT" - revision = "1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded" - -[[projects]] - digest = "1:8029e9743749d4be5bc9f7d42ea1659471767860f0cdc34d37c3111bd308a295" - name = "golang.org/x/text" - packages = [ - "internal/gen", - "internal/triegen", - "internal/ucd", - "transform", - "unicode/cldr", - "unicode/norm", - ] - pruneopts = "UT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" - -[[projects]] - digest = "1:c805e517269b0ba4c21ded5836019ed7d16953d4026cb7d00041d039c7906be9" - name = "gopkg.in/natefinch/lumberjack.v2" - packages = ["."] - pruneopts = "UT" - revision = "a96e63847dc3c67d17befa69c303767e2f84e54f" - version = "v2.1" - -[[projects]] - branch = "v2" - digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "UT" - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/asdine/storm", - "github.com/filebrowser/filebrowser/lib", - "github.com/filebrowser/filebrowser/lib/bolt", - "github.com/filebrowser/filebrowser/lib/http", - "github.com/filebrowser/filebrowser/lib/staticgen", - "github.com/hacdias/fileutils", - "github.com/mitchellh/go-homedir", - "github.com/spf13/cobra", - "github.com/spf13/viper", - "gopkg.in/natefinch/lumberjack.v2", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/cli/Gopkg.toml b/cli/Gopkg.toml deleted file mode 100644 index 61d1fb01..00000000 --- a/cli/Gopkg.toml +++ /dev/null @@ -1,58 +0,0 @@ -# Gopkg.toml example -# -# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" -# -# [prune] -# non-go = false -# go-tests = true -# unused-packages = true - - -[[constraint]] - name = "github.com/asdine/storm" - version = "2.1.1" - -[[constraint]] - branch = "feat/use-cobra" - name = "github.com/filebrowser/filebrowser" - -[[constraint]] - branch = "master" - name = "github.com/hacdias/fileutils" - -[[constraint]] - branch = "master" - name = "github.com/mitchellh/go-homedir" - -[[constraint]] - name = "github.com/spf13/cobra" - version = "0.0.3" - -[[constraint]] - name = "github.com/spf13/viper" - version = "1.1.0" - -[[constraint]] - name = "gopkg.in/natefinch/lumberjack.v2" - version = "2.1.0" - -[prune] - go-tests = true - unused-packages = true