From 942f6b37cf7583080d33e4e073c3a997ef45bf9c Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Wed, 3 Aug 2016 15:41:36 +0200 Subject: [PATCH] fix docker env null problem --- dist/smartstring.docker.js | 12 +++++++----- package.json | 6 +++--- ts/smartstring.docker.ts | 12 +++++++----- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dist/smartstring.docker.js b/dist/smartstring.docker.js index 10e2374..5d096ae 100644 --- a/dist/smartstring.docker.js +++ b/dist/smartstring.docker.js @@ -7,11 +7,13 @@ exports.makeEnvObject = function (envArrayArg) { let returnObject = {}; let regexString = /(.*)=(.*)/; - for (let envKey in envArrayArg) { - let regexMatches = regexString.exec(envArrayArg[envKey]); - returnObject[regexMatches[1]] = regexMatches[2]; + if (typeof envArrayArg !== "undefined") { + for (let envKey in envArrayArg) { + let regexMatches = regexString.exec(envArrayArg[envKey]); + returnObject[regexMatches[1]] = regexMatches[2]; + } + ; } - ; return returnObject; }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzdHJpbmcuZG9ja2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzdHJpbmcuZG9ja2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFFQTs7OztHQUlHO0FBQ1EscUJBQWEsR0FBRyxVQUFTLFdBQW9CO0lBQ3BELElBQUksWUFBWSxHQUFHLEVBQUUsQ0FBQztJQUN0QixJQUFJLFdBQVcsR0FBRyxXQUFXLENBQUM7SUFDOUIsR0FBRyxDQUFBLENBQUMsSUFBSSxNQUFNLElBQUksV0FBVyxDQUFDLENBQUEsQ0FBQztRQUMzQixJQUFJLFlBQVksR0FBRyxXQUFXLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQ3pELFlBQVksQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDcEQsQ0FBQztJQUFBLENBQUM7SUFDRixNQUFNLENBQUMsWUFBWSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzdHJpbmcuZG9ja2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzdHJpbmcuZG9ja2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFFQTs7OztHQUlHO0FBQ1EscUJBQWEsR0FBRyxVQUFVLFdBQXFCO0lBQ3RELElBQUksWUFBWSxHQUFHLEVBQUUsQ0FBQztJQUN0QixJQUFJLFdBQVcsR0FBRyxXQUFXLENBQUM7SUFDOUIsRUFBRSxDQUFDLENBQUMsT0FBTyxXQUFXLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztRQUNyQyxHQUFHLENBQUMsQ0FBQyxJQUFJLE1BQU0sSUFBSSxXQUFXLENBQUMsQ0FBQyxDQUFDO1lBQzdCLElBQUksWUFBWSxHQUFHLFdBQVcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDekQsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNwRCxDQUFDO1FBQUEsQ0FBQztJQUNOLENBQUM7SUFDRCxNQUFNLENBQUMsWUFBWSxDQUFDO0FBQ3hCLENBQUMsQ0FBQyJ9 \ No newline at end of file diff --git a/package.json b/package.json index 2850ae1..94f63ca 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,12 @@ }, "homepage": "https://gitlab.com/pushrocks/smartstring#readme", "devDependencies": { - "npmts-g": "^5.2.6", - "should": "^9.0.2", + "npmts-g": "^5.2.8", + "should": "^10.0.0", "typings-test": "^1.0.1" }, "dependencies": { - "beautylog": "^5.0.13", + "beautylog": "^5.0.20", "typings-global": "^1.0.6" } } diff --git a/ts/smartstring.docker.ts b/ts/smartstring.docker.ts index 9f56c8e..67da173 100644 --- a/ts/smartstring.docker.ts +++ b/ts/smartstring.docker.ts @@ -5,12 +5,14 @@ import * as plugins from "./smartstring.plugins"; * @param envArrayArg * @returns {} */ -export let makeEnvObject = function(envArrayArg:string[]){ +export let makeEnvObject = function (envArrayArg: string[]) { let returnObject = {}; let regexString = /(.*)=(.*)/; - for(let envKey in envArrayArg){ - let regexMatches = regexString.exec(envArrayArg[envKey]); - returnObject[regexMatches[1]] = regexMatches[2]; - }; + if (typeof envArrayArg !== "undefined") { + for (let envKey in envArrayArg) { + let regexMatches = regexString.exec(envArrayArg[envKey]); + returnObject[regexMatches[1]] = regexMatches[2]; + }; + } return returnObject; }; \ No newline at end of file