From 102c8960468338ba95751dde15f09f48bd17fd11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 5 Feb 2015 12:27:58 +0100
Subject: [PATCH] Updated build and wercker file for new repo structure

---
 Gruntfile.js        | 2 +-
 tasks/build_task.js | 3 +--
 wercker.yml         | 8 +++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 5494a893ce3..5065398642b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,7 @@ module.exports = function (grunt) {
     docsDir: 'docs/'
   };
 
-  config.mode = grunt.option('mode') || 'standalone';
+  config.mode = grunt.option('mode') || 'backend';
   config.modeOptions = {
     zipSuffix: '',
     requirejs: {
diff --git a/tasks/build_task.js b/tasks/build_task.js
index 3f3e31ce623..a214da8f5f2 100644
--- a/tasks/build_task.js
+++ b/tasks/build_task.js
@@ -35,14 +35,13 @@ module.exports = function(grunt) {
       });
       grunt.config('clean.dest_dir', ['<%= destDir %>']);
       grunt.config('copy.backend_bin', {
-        cwd: '../bin',
+        cwd: 'bin',
         expand: true,
         src: ['grafana'],
         options: { mode: true},
         dest: '<%= tempDir %>'
       });
       grunt.config('copy.backend_files', {
-        cwd: '../',
         expand: true,
         src: ['conf/*', 'vendor/**/*', '!conf/grafana.dev.ini'],
         dest: '<%= tempDir %>'
diff --git a/wercker.yml b/wercker.yml
index 52d0eeb0062..a70ceec326c 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -24,15 +24,13 @@ build:
         code: |
           go run build.go test
     # frontend
-    - npm-install:
-        cwd: grafana/
+    - npm-install
     - grunt:
-        cwd: grafana/
-        tasks: release --mode=backend
+        tasks: release
     - script:
         name: copy output
         code: |-
-          rsync -rv "$WERCKER_SOURCE_DIR/grafana/dist/" "$WERCKER_OUTPUT_DIR"
+          rsync -rv "$WERCKER_SOURCE_DIR/dist/" "$WERCKER_OUTPUT_DIR"
 deploy:
   steps:
     - add-to-known_hosts: