Merge branch 'develop'

geblanco · Jan 31, 2018 · 3374433 · 3374433
2 parents c8c274e + 620acac
commit 3374433
Show file tree

Hide file tree

Showing 4 changed files with 3,299 additions and 18 deletions.
diff --git a/apps/system/calculatorApp.js b/apps/system/calculatorApp.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var _numberRegex = /([0-9]+(?:\.[0-9]+)?(?:[ ]?[/*+-]+[ ]?[0-9]+(?:\.[0-9]+)?)*)$/
+var _numberRegex = /^([0-9]+(?:\.[0-9]+)?(?:[ ]?[/*+-]+[ ]?[0-9]+(?:\.[0-9]+)?)*)$/
 // make a regex out of the name for searching strings
 var _queryRegex = /^calc ([0-9]+(?:\.[0-9]+)?(?:[ ]?[/*+-]+[ ]?[0-9]+(?:\.[0-9]+)?)*)$/i;
 var _fn = function( exec, query ){

diff --git a/install/mkDist.sh b/install/mkDist.sh
@@ -10,13 +10,12 @@ $srcDir/node_modules/.bin/electron-packager $srcDir/ mutant \
 	--platform=linux \
 	--arch=${arch} \
 	--version=1.4.0 \
-	--prune \
 	--ignore=".gitignore" \
 	--ignore=".git" \
 	--ignore="Model.md" \
 	--version-string.FileDescription="Mutant" \
-	--version-string.FileVersion="0.1.0" \
-	--version-string.ProductVersion="0.1.0" \
+	--version-string.FileVersion="0.1.4" \
+	--version-string.ProductVersion="0.1.4" \
 	--version-string.ProductName="Mutant" \
-	--app-version="0.1.0" \
-	--overwrite
+	--app-version="0.1.4" \
+	--overwrite