From f9e3923ae799dcc011bbda0aa31a977094fcf064 Mon Sep 17 00:00:00 2001 From: 1138-4EB <1138-4EB@users.noreply.github.com> Date: Wed, 6 Jun 2018 20:55:18 +0100 Subject: [PATCH] add filebrowser/frontend as a submodule Former-commit-id: 689395356dc1860d0f0f5786986cbbc4238a1fe0 [formerly 0c528dae26624fad221c4fa6b273a02dc030e81c] [formerly f353338b249c2ed818611ac6a91939bc87356de9 [formerly a2e293292ec9f946d14a47d16f6741f2b28d0c8c]] Former-commit-id: 647dac9f8eed2df57191a75e4b199aebb18375fc [formerly 000079405f67a4bff2098c2cddc082a4374e0bd5] Former-commit-id: 89c911c807783e2176994fc6949bf8221ca5e5a3 --- .gitignore | 1 - .gitmodules | 3 +++ build.sh | 4 ---- frontend | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 .gitmodules create mode 160000 frontend diff --git a/.gitignore b/.gitignore index aecda952..d6c1e4fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ .DS_Store -frontend/ */dist/* *.db *.db.lock diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..41ab3862 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "frontend"] + path = frontend + url = https://github.com/filebrowser/frontend diff --git a/build.sh b/build.sh index 89ee9981..ae818c56 100644 --- a/build.sh +++ b/build.sh @@ -5,16 +5,12 @@ set -e cd $(dirname $0) # Clean the dist folder and build the assets -if [ ! -d "frontend" ]; then - git clone -b master https://github.com/filebrowser/frontend -fi; cd frontend if [ -d "dist" ]; then rm -rf dist/* fi; yarn install yarn build - cd .. dep ensure -vendor-only diff --git a/frontend b/frontend new file mode 160000 index 00000000..f5c48c96 --- /dev/null +++ b/frontend @@ -0,0 +1 @@ +Subproject commit f5c48c9679ef16f2d2dfb88d7cdcea929463f2ed