Skip to content

Commit

Permalink
Merge pull request #8 from Cox-Automotive/develop
Browse files Browse the repository at this point in the history
Switching to custom fork of clortho
  • Loading branch information
brianantonelli authored Sep 7, 2016
2 parents 7c6e6b9 + 751f6a6 commit c2263c0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions bin/alks-keys-create
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if(!_.contains(outputValues, output)){
async.waterfall([
// check to be sure were configured
function(callback){
Account.ensureConfigured(callback);
Account.ensureConfigured(callback);
},
// get account
function(callback){
Expand All @@ -62,7 +62,7 @@ async.waterfall([
// calculate expiration
var expires = moment().add(duration, 'hours');
console.error(clc.white('Your AWS session data has been generated and expires ' + expires.calendar()));

// store session data in DB
keys.addKey(sessionData.accessKey, sessionData.secretKey,
sessionData.sessionToken, sessionData.guiURL,
Expand Down
2 changes: 1 addition & 1 deletion lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@ exports.passwordSaveErrorHandler = function(err){
console.error(clc.red('Error saving password!'), err.message);

if(process.platform === 'win32'){
console.error(clc.red('It looks like you\'re on Windows. This is most likely a script permission error. Please run: "Set-ExecutionPolicy -Scope CurrentUser" and enter "remotesigned" and try again.'));
console.error(clc.red('It looks like you\'re on Windows. This is most likely a script permission error. Please run: "Set-ExecutionPolicy -Scope CurrentUser remotesigned", press "Y" and try again.'));
}
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alks",
"version": "1.3.1",
"version": "1.3.2",
"description": "CLI for working with ALKS",
"main": "bin/alks",
"scripts": {
Expand Down Expand Up @@ -40,6 +40,7 @@
"cli-color": "^1.1.0",
"cli-table2": "^0.2.0",
"clortho": "^1.2.2",
"clortho": "github:Cox-Automotive/clortho.git#bb96e8473d8935450349978c8d894aadc39600f9",
"commander": "^2.9.0",
"crypto": "0.0.3",
"fuzzy": "^0.1.1",
Expand Down

0 comments on commit c2263c0

Please sign in to comment.