Fix building/running on Linux from Source

index.html

@@ -27,7 +27,7 @@
     <script>
       (function() {
         const script = document.createElement('script');
-        if (process.env.ENV === 'development '){
+        if (process.env.NODE_ENV === 'development'){
           script.src = 'http://localhost:9000/dist/bundle.js';
         }else{
           script.src = './dist/bundle.js';

package.json

@@ -20,7 +20,7 @@
   ],
   "main": "main.js",
   "scripts": {
-    "start": "set ENV=development & electron .",
+    "start": "cross-env NODE_ENV=development electron .",
     "dev": "concurrently -k \"babel-node server.js\" \"npm start\"",
     "winbuild": "webpack --config webpack.config.production.js && electron-packager . BloodHound --platform=win32 --arch=all --overwrite --prune --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --icon=src/img/icon.ico",
     "macbuild": "webpack --config webpack.config.production.js && electron-packager . BloodHound --platform=darwin --arch=all --overwrite --prune --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --icon=src/img/icon.icns",
@@ -42,6 +42,7 @@
     "babel-preset-react": "^6.11.1",
     "babel-preset-stage-0": "^6.5.0",
     "concurrently": "^2.2.0",
+    "cross-env": "^2.0.0",
     "electron-prebuilt": "^1.2.8",
     "express": "^4.14.0",
     "webpack": "^1.13.1",

src/AppContainer.jsx

@@ -1,19 +1,19 @@
 import React, { Component } from 'react';
-import GraphContainer from './components/graph';
-import SearchContainer from './components/SearchContainer/searchcontainer';
-import SpotlightContainer from './components/Spotlight/spotlightcontainer';
-import LogoutModal from './components/Modals/logoutmodal';
-import ClearWarnModal from './components/Modals/clearwarnmodal'
-import ClearConfirmModal from './components/Modals/clearconfirmmodal'
-import ClearingModal from './components/Modals/clearingmodal'
-import LoadingContainer from './components/Float/loadingcontainer';
-import GenericAlert from './components/Float/alert';
-import RawQuery from './components/rawquery';
-import MenuContainer from './components/Menu/menucontainer';
-import ExportContainer from './components/Float/exportcontainer';
-import Settings from './components/Float/settings'
-import ZoomContainer from './components/Zoom/zoomcontainer'
-import QueryNodeSelect from './components/Float/querynodeselect'
+import GraphContainer from './components/Graph';
+import SearchContainer from './components/SearchContainer/SearchContainer';
+import SpotlightContainer from './components/Spotlight/SpotlightContainer';
+import LogoutModal from './components/Modals/LogoutModal';
+import ClearWarnModal from './components/Modals/ClearWarnModal'
+import ClearConfirmModal from './components/Modals/ClearConfirmModal'
+import ClearingModal from './components/Modals/ClearingModal'
+import LoadingContainer from './components/Float/LoadingContainer';
+import GenericAlert from './components/Float/Alert';
+import RawQuery from './components/RawQuery';
+import MenuContainer from './components/Menu/MenuContainer';
+import ExportContainer from './components/Float/ExportContainer';
+import Settings from './components/Float/Settings'
+import ZoomContainer from './components/Zoom/ZoomContainer'
+import QueryNodeSelect from './components/Float/QueryNodeSelect'
 
 export default class AppContainer extends Component {
 	constructor(){

src/components/Float/QueryNodeSelect.jsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { ListGroup, ListGroupItem, Panel } from 'react-bootstrap'
 import { fullAjax } from 'utils'
 import { If, Then, Else } from 'react-if';
-import QueryNodeSelectItem from './querynodeselectitem'
+import QueryNodeSelectItem from './QueryNodeSelectItem'
 
 export default class QueryNodeSelect extends Component {
 	constructor(){
@@ -24,6 +24,8 @@ export default class QueryNodeSelect extends Component {
 				var y = $.map(data.results[0].data, function(x){
 					return x.row[0].name
 				})
+
+				y.sort()
 				this.setState({data: y})
 			}.bind(this))
 		$.ajax(o)

src/components/Menu/MenuContainer.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import MenuButton from './menubutton';
+import MenuButton from './MenuButton';
 import { buildMergeQuery, defaultAjaxSettings } from 'utils';
 const { dialog } = require('electron').remote
 var fs = require('fs')

src/components/Modals/LogoutModal.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
-import Login from '../Float/login'
+import Login from '../Float/Login'
 
 var Modal = require('react-bootstrap').Modal;
 

src/components/SearchContainer/SearchContainer.jsx

@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
-import GlyphiconSpan from '../glyphiconspan'
-import Icon from '../icon'
+import GlyphiconSpan from '../GlyphiconSpan'
+import Icon from '../Icon'
 import { escapeRegExp, fullAjax } from 'utils';
-import TabContainer from './tabcontainer'
+import TabContainer from './TabContainer'
 
 export default class SearchContainer extends Component {
     constructor(props){

src/components/SearchContainer/TabContainer.jsx

@@ -1,10 +1,10 @@
 import React, { Component } from 'react';
-import DatabaseDataDisplay from './Tabs/databasedatadisplay'
-import PrebuiltQueriesDisplay from './Tabs/prebuiltqueriesdisplay'
-import NoNodeData from './Tabs/nonodedata'
-import UserNodeData from './Tabs/usernodedata'
-import GroupNodeData from './Tabs/groupnodedata';
-import ComputerNodeData from './Tabs/computernodedata';
+import DatabaseDataDisplay from './Tabs/DatabaseDataDisplay'
+import PrebuiltQueriesDisplay from './Tabs/PrebuiltQueriesDisplay'
+import NoNodeData from './Tabs/NoNodeData'
+import UserNodeData from './Tabs/UserNodeData'
+import GroupNodeData from './Tabs/GroupNodeData';
+import ComputerNodeData from './Tabs/ComputerNodeData';
 import { Tabs, Tab } from 'react-bootstrap';
 
 export default class TabContainer extends Component {

src/components/SearchContainer/Tabs/ComputerNodeData.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { fullAjax } from 'utils';
-import NodeALink from './nodealink'
+import NodeALink from './NodeALink'
 
 export default class ComputerNodeData extends Component {
 	propTypes: {

src/components/SearchContainer/Tabs/DatabaseDataDisplay.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { fullAjax, defaultAjaxSettings } from 'utils';
-import LogoutModal from 'modals/logoutmodal';
+import LogoutModal from 'modals/LogoutModal';
 
 export default class DatabaseDataDisplay extends Component {
 	constructor(){

src/components/SearchContainer/Tabs/GroupNodeData.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import NodeALink from './nodealink'
+import NodeALink from './NodeALink'
 import { fullAjax } from 'utils';
 
 export default class GroupNodeData extends Component {

src/components/SearchContainer/Tabs/PrebuiltQueriesDisplay.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import PrebuiltQueryNode from './prebuiltquerynode'
+import PrebuiltQueryNode from './PrebuiltQueryNode'
 var fs = require('fs')
 
 export default class PrebuiltQueriesDisplay extends Component {

src/components/SearchContainer/Tabs/UserNodeData.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import NodeALink from './nodealink'
+import NodeALink from './NodeALink'
 import { fullAjax } from 'utils'
 
 export default class UserNodeData extends Component {

src/components/Spotlight/SpotlightContainer.jsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import GlyphiconSpan from '../glyphiconspan';
-import Icon from '../icon';
-import SpotlightRow from './spotlightrow'
+import GlyphiconSpan from '../GlyphiconSpan';
+import Icon from '../Icon';
+import SpotlightRow from './SpotlightRow'
 
 export default class SpotlightContainer extends Component {
 	constructor(props){

src/index.js

@@ -2,8 +2,8 @@ import 'babel-polyfill'; // generators
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import AppContainer from './appcontainer';
-import Login from './components/Float/login'
+import AppContainer from './AppContainer';
+import Login from './components/Float/Login'
 import { getStorageData, storageHasKey, storageSetKey } from './js/utils.js';
 
 const ConfigStore = require('configstore');