From 6403bbdc573e3eb146f48cdc632afa6de72a87d9 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Fri, 28 Dec 2018 20:09:00 +0000
Subject: [PATCH] chore: update travis scripts

License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
---
 .travis.yml           | 10 +++++-----
 build/build.sh        |  6 +++---
 build/build_all.sh    |  8 ++++----
 build/build_assets.sh |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 87c5f982..5f8be73e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,17 +12,17 @@ env:
   - USE_DOCKER="true"
 stages:
   - lint
-  - test
+  - build
   - release
 cache:
   directories:
-    - lib/rice-box.go
+    - http/rice-box.go
 jobs:
   include:
   - stage: lint
-    script: "./build/run_gometalinter.sh"
-  - stage: test
-    script: "./build/build_all.sh"
+    script: ./build/run_gometalinter.sh
+  - stage: build
+    script: ./build/build_all.sh
     deploy:
       provider: script
       skip_cleanup: true
diff --git a/build/build.sh b/build/build.sh
index cd647661..63dfadd1 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -2,13 +2,13 @@
 
 set -e
 
-cd $(dirname $0)/../cli
+cd $(dirname $0)/..
 
 go get -v ./...
 
 if [ "$COMMIT_SHA" != "" ]; then
   echo "Set version to ($COMMIT_SHA)"
-  sed -i.bak "s|(untracked)|($COMMIT_SHA)|g" ../lib/filebrowser.go
+  sed -i.bak "s|(untracked)|($COMMIT_SHA)|g" ../filebrowser.go
 fi
 
 echo "Build CLI"
@@ -16,5 +16,5 @@ go build -a -o filebrowser
 
 if [ "$COMMIT_SHA" != "" ]; then
   echo "Reset version to (untracked)"
-  sed -i "s|($COMMIT_SHA)|(untracked)|g" ../lib/filebrowser.go
+  sed -i "s|($COMMIT_SHA)|(untracked)|g" ../filebrowser.go
 fi
diff --git a/build/build_all.sh b/build/build_all.sh
index e8954ac8..647f819e 100755
--- a/build/build_all.sh
+++ b/build/build_all.sh
@@ -2,8 +2,8 @@
 
 cd $(dirname $0)/..
 
-if [ -d lib/"rice-box.go" ]; then
-  rm -rf lib/rice-box.go
+if [ -d http/"rice-box.go" ]; then
+  rm -rf http/rice-box.go
 fi
 
 if [ "$USE_DOCKER" != "" ]; then
@@ -36,8 +36,8 @@ if [ "$USE_DOCKER" != "" ]; then
     for d in "dist/" "node_modules/"; do
       docker cp filebrowser-tmp://src/frontend/$d frontend
     done
-    docker cp filebrowser-tmp://src/cli/filebrowser ./filebrowser
-    docker cp filebrowser-tmp://src/lib/rice-box.go ./lib/rice-box.go
+    docker cp filebrowser-tmp://src/filebrowser ./filebrowser
+    docker cp filebrowser-tmp://src/http/rice-box.go ./http/rice-box.go
   else
     echo "BUILD FAILED!"
   fi
diff --git a/build/build_assets.sh b/build/build_assets.sh
index 73a825f8..d3ae2170 100755
--- a/build/build_assets.sh
+++ b/build/build_assets.sh
@@ -19,5 +19,5 @@ if ! [ -x "$(command -v rice)" ]; then
 fi
 
 # Embed the assets using rice
-cd lib
+cd http
 rice embed-go