Merge pull request #2 from mikecentola/dev

Dev

Author: mikecentola

.gitignore

@@ -2,6 +2,11 @@
 ##############
 work/*
 
+# Node Modules #
+################
+node_modules/*
+package-lock.json
+
 # Compiled source #
 ###################
 *.com

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
-## [v0.0.1] (https://github.com/mikecentola/cmder-inst/tree/v0.0.1) (2016-08-02)
+## [v.0.0.2] https://github.com/mikecentola/cmder-inst/tree/v0.0.2-alpha) (2019-01-08)
+
+ - Updated for Cmder v1.3.11
+
+## [v0.0.1] (https://github.com/mikecentola/cmder-inst/tree/v0.0.1-alpha) (2016-08-02)
 
 - Initial Release

README.md

@@ -2,16 +2,43 @@
 
 Cmder Installer is an install executable that will fetch the latest version of Cmder online, un-pack it, and install it, using the Nullsoft Installer. It has several options including location to install to, windows explorer integration, and shorcuts.
 
+
 ## About Cmder
 [Cmder](http://Cmder.net) is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://conemu.github.io/) with *major* config overhaul, comes with a Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) (further enhanced by [clink-completions](https://github.com/vladimir-kotikov/clink-completions)) and a custom prompt layout.
 
 ![Cmder Screenshot](http://i.imgur.com/g1nNf0I.png)
 
+Current Cmder Release: *v1.3.11*
+
 
 ## Languages
 
 Right now, Cmder Installer is only set up with English. We will be adding more languages in future releases.
 
+## Building / Compiling
+
+### Prerequisites
+
+ - Download [NSIS](http://nsis.sourceforge.net)
+ - Required NSIS Plugins
+   - [inetc](https://nsis.sourceforge.io/Inetc_plug-in)
+   - [ZipDLL](https://nsis.sourceforge.io/ZipDLL_plug-in)
+
+ - If using nodejs to build
+   - Make sure that NSIS is properly installed with `makensis` in your PATH
+   - Install nodejs / npm
+  
+### Build Using NSIS Gui
+
+- Load cmder_inst.nsi into NSIS Gui Application and build
+
+### Build using NodeJS / NPM
+
+- `npm install`
+- `npm run build`
+
+
+
 ## Contributing
 
 For more information on contributing, please refer to our [CONTRIBUTING](https://github.com/mikecentola/cmder-inst/blob/master/CONTRIBUTING.md)
@@ -22,7 +49,7 @@ All software included is bundled with own license
 
 The MIT License (MIT)
 
-Copyright (c) 2016 Mike Centola
+Copyright (c) 2019 Mike Centola
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.js

@@ -1,3 +1,35 @@
+/* NPM build.js to automate build process with nodejs
+ *
+ *   Written by Eric Hocking (https://github.com/xaoseric)
+ *   Written by Mike Centola (http://github.com/mikecentola)
+ *
+ *   Intended for NSIS 3.0
+
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Mike Centola, Eric Hocking
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+const VERSION = process.env.npm_package_version;
+
 const makensis = require('makensis');
 const axios = require('axios');
 const path = require('path');
@@ -15,16 +47,18 @@ async function buildRelease(tag) {
   let options = {
     verbose: 2,
     define: {
-        'CMDER_VERSION': tag
+        'CMDER_VERSION': tag,
+        'INSTALLER_VERSION': VERSION
     }
   };
-
+  
+  console.log('Cmder Installer Version: ', VERSION);
   console.log('Found latest tag:', tag);
   console.log('Building NSIS installer for Cmder', options.define.CMDER_VERSION);
 
   try {
     let output = await makensis.compile(path.join(__dirname, 'cmder_inst.nsi'), options);
-    console.log(`Standard output:\n${output.stdout}`);
+    console.log(`\n${output.stdout}`);
   } catch (output) {
     console.error(`Exit Code ${output.status}: ${output.stderr}`);
   }

cmder_inst.nsi

@@ -5,7 +5,7 @@
 
 ; The MIT License (MIT)
 ;
-; Copyright (c) 2016 Mike Centola
+; Copyright (c) 2019 Mike Centola
 ;
 ; Permission is hereby granted, free of charge, to any person obtaining a copy
 ; of this software and associated documentation files (the "Software"), to deal
@@ -43,7 +43,6 @@
 ;--------------------------------
 ; General
 
-    !define INSTALLER_VERSION "0.0.1-alpha"
     !define APP_NAME "Cmder"
     !define CMDER_DLURL "http://github.com/cmderdev/cmder/releases/download/${CMDER_VERSION}/cmder_mini.zip"
     !define CMDER_URL "http://cmder.net"

package.json

@@ -1,6 +1,8 @@
 {
     "name": "cmder_inst",
-    "version": "1.0.0",
+    "version": "0.0.2-alpha",
+    "author": "Mike Centola",
+    "description": "Cmder Installer",
     "license": "MIT",
     "scripts": {
         "build": "node build.js"