From 504cfcf8fff98e701457d017bde612b6c4110e21 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Fri, 21 Dec 2018 23:06:24 +0100
Subject: [PATCH] build fix (fixes 579)

---
 scripts/vars.js                                    | 4 ++--
 terminus-terminal/src/services/sessions.service.ts | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/vars.js b/scripts/vars.js
index 85b9585f..34cb45a7 100755
--- a/scripts/vars.js
+++ b/scripts/vars.js
@@ -6,8 +6,8 @@ const appInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../app/packa
 const electronInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../node_modules/electron/package.json')))
 
 exports.version = childProcess.execSync('git describe --tags', {encoding:'utf-8'})
-exports.version = exports.version.substring(1)
-exports.version = exports.version.replace('-g', 'g')
+exports.version = exports.version.substring(1).trim()
+exports.version = exports.version.replace('-', '-c')
 
 exports.builtinPlugins = [
   'terminus-core',
diff --git a/terminus-terminal/src/services/sessions.service.ts b/terminus-terminal/src/services/sessions.service.ts
index 9b7871fc..210c18b4 100644
--- a/terminus-terminal/src/services/sessions.service.ts
+++ b/terminus-terminal/src/services/sessions.service.ts
@@ -6,7 +6,6 @@ import { first } from 'rxjs/operators'
 import { Injectable } from '@angular/core'
 import { Logger, LogService, ConfigService } from 'terminus-core'
 import { exec } from 'mz/child_process'
-import TerminalModule from '..'
 import { SessionOptions } from '../api'
 
 let macOSNativeProcessList
@@ -248,7 +247,7 @@ export class Session extends BaseSession {
     }
 }
 
-@Injectable({ providedIn: TerminalModule })
+@Injectable({ providedIn: 'root' })
 export class SessionsService {
     sessions: {[id: string]: BaseSession} = {}
     logger: Logger