From 8530ebb48b4c0bbcb5a06d8ab6b6a31fdac19a7c Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 6 Feb 2014 14:55:28 -0700
Subject: [PATCH] Fixed the bower release process

---
 .gitignore               | 1 +
 Gruntfile.js             | 2 +-
 grunt/browser_clients.js | 2 +-
 grunt/config/jshint.js   | 2 +-
 grunt/config/run.js      | 2 +-
 scripts/release/bower.js | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 39702844a..eaba4f82a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ test/integration/yaml_suite/log
 test/integration/yaml_suite/yaml_tests*.json
 test/integration/yaml_suite/index*.js
 src/elasticsearch*/
+src/bower*/
 junit-*.xml
 elasticsearch*.log
 sauce_connect.lo*
diff --git a/Gruntfile.js b/Gruntfile.js
index 64493d794..52c1ef8ad 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,7 +8,7 @@ module.exports = function (grunt) {
     init: true,
     config: {
       distDir: __dirname + '/dist',
-      bowerSubmodule: __dirname + '/src/bower-elasticsearch-js',
+      bowerSubmodule: __dirname + '/src/bower_es_js',
       meta: {
         banner: '/*! <%= package.name %> - v<%= package.version %> - ' +
           '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
diff --git a/grunt/browser_clients.js b/grunt/browser_clients.js
index 5711bbe24..c8e01a9b3 100644
--- a/grunt/browser_clients.js
+++ b/grunt/browser_clients.js
@@ -31,7 +31,7 @@ module.exports = function (grunt) {
     'browser_clients:build',
     'run:clone_bower_repo',
     'copy:dist_to_bower',
-    'run:release_bower_subm_tag'
+    'run:release_bower_tag'
   ]);
 
   grunt.registerTask('_upload_archive', function (type) {
diff --git a/grunt/config/jshint.js b/grunt/config/jshint.js
index 5323723a5..1d0ee0991 100644
--- a/grunt/config/jshint.js
+++ b/grunt/config/jshint.js
@@ -1,7 +1,7 @@
 module.exports = {
   source: {
     src: [
-      'src/**/*.js -src/elasticsearch*/**/* -src/bower-elasticsearch-js/**/*',
+      'src/**/*.js -src/elasticsearch*/**/* -<%= bowerSubmodule %>/**/*',
       'scripts/**/*.js',
       'test/**/*.js -test/browser_integration/yaml_tests.js',
       'grunt/**/*.js',
diff --git a/grunt/config/run.js b/grunt/config/run.js
index ca19cbe26..b199e93b1 100644
--- a/grunt/config/run.js
+++ b/grunt/config/run.js
@@ -32,7 +32,7 @@ var config = {
   clone_bower_repo: {
     exec: [
       'test -d src/bower_es_js',
-      'git clone git@github.com:elasticsearch/bower-elasticsearch-js.git src/bower_es_js'
+      'git clone git@github.com:elasticsearch/bower-elasticsearch-js.git <%= bowerSubmodule %>'
     ].join(' || '),
     options: {
       quiet: true
diff --git a/scripts/release/bower.js b/scripts/release/bower.js
index 79e0135ff..ed5b3fd44 100644
--- a/scripts/release/bower.js
+++ b/scripts/release/bower.js
@@ -4,7 +4,7 @@ var async = require('async');
 var _ = require('lodash');
 
 var root = require('path').join(__dirname, '../..');
-var bowerDir = root + '/src/bower-elasticsearch-js';
+var bowerDir = root + '/src/bower_es_js';
 
 // get both the bower and node package files
 var bowerJson = require(bowerDir + '/bower.json');