Change application package name

.travis.yml

@@ -65,22 +65,22 @@ after_success:
  - set -e
  - if [[ "$TRAVIS_NODE_VERSION" == "4" && "$TRAVIS_OS_NAME" == "osx" ]]; then
  pushd output;
- zip -q -r cncjs-darwin-x64.zip cncjs-darwin-x64/;
+ zip -q -r cnc-darwin-x64.zip cnc-darwin-x64/;
  popd;
- scripts/travis-release-darwin-x64.sh output/cncjs-darwin-x64.zip;
+ scripts/travis-release-darwin-x64.sh output/cnc-darwin-x64.zip;
  fi
  - if [[ "$TRAVIS_NODE_VERSION" == "4" && "$TRAVIS_OS_NAME" == "linux" ]]; then
  pushd output;
- zip -q -r cncjs-linux-x64.zip cncjs-linux-x64/;
+ zip -q -r cnc-linux-x64.zip cnc-linux-x64/;
  popd;
- scripts/travis-release-linux-x64.sh output/cncjs-linux-x64.zip;
+ scripts/travis-release-linux-x64.sh output/cnc-linux-x64.zip;
  fi
  - if [[ "$TRAVIS_NODE_VERSION" == "5" && "$TRAVIS_OS_NAME" == "linux" ]]; then
  scripts/travis-docker-build.sh;
  fi
 
 before_deploy:
- - export DEPLOY_FILE=$(ls output/cncjs-*.zip)
+ - export DEPLOY_FILE=$(ls output/cnc-*.zip)
  - echo "Deploying $DEPLOY_FILE to GitHub releases"
 deploy:
  provider: releases

appveyor.yml

@@ -61,18 +61,18 @@ deploy_script:
  - ps: |
  If ($env:nodejs_version -eq '4') {
  pushd output
- 7z a -r cncjs-win32-x64.zip cncjs-win32-x64 > $NULL
+ 7z a -r cnc-win32-x64.zip cnc-win32-x64 > $NULL
  popd
- bash -c 'scripts/appveyor-release-win32-x64.sh output/cncjs-win32-x64.zip'
+ bash -c 'scripts/appveyor-release-win32-x64.sh output/cnc-win32-x64.zip'
  }
 
 test: off
 
 # Packaging artifacts
 # https://www.appveyor.com/docs/packaging-artifacts
 artifacts:
- - path: output/cncjs-win32-x64.zip
- name: cncjs-win32-x64
+ - path: output/cnc-win32-x64.zip
+ name: cnc-win32-x64
  type: zip
 
 # Publishing artifacts to GitHub Releases
@@ -81,7 +81,7 @@ deploy:
  provider: GitHub
  auth_token:
  secure: IZ0tfrzBdm07S3zt3Hli+p1BbHkTJf4SfZMH2VcOU7k89lpOFyAolYf7zID6VKSJ
- artifact: cncjs-win32-x64
+ artifact: cnc-win32-x64
  draft: false
  prerelease: false
  on:

bin/cnc

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-var cnc = require('../dist/cncjs/cnc').default;
+var cnc = require('../dist/cnc/cnc').default;
 
 cnc(function(server) {
  const address = server.address();

gulp/tasks/bootstrap.js

@@ -17,7 +17,8 @@ export default (options) => {
  // Copy necessary properties from 'package.json' to 'src/package.json'
  const _pkg = require('../../src/package.json');
 
- _pkg.name = pkg.name;
+ // Development package.json: name=cncjs (https://www.npmjs.com/package/cncjs)
+ // Application package.json: name=cnc
  _pkg.version = pkg.version;
  _pkg.description = pkg.description;
  _pkg.homepage = pkg.homepage;

scripts/appveyor-release-win32-x64.sh

@@ -6,7 +6,7 @@ if [[ -z "$FILE" ]]; then
  exit 1;
 fi
 
-RELEASE="cncjs-${APPVEYOR_TAG_NAME:-${APPVEYOR_REPO_BRANCH:-latest}}"
+RELEASE="cnc-${APPVEYOR_TAG_NAME:-${APPVEYOR_REPO_BRANCH:-latest}}"
 DESCRIPTION=`git log -1 --date=iso`
 
 scripts/github-release.sh \

scripts/electron-packager.sh

@@ -6,7 +6,7 @@ VERSION=0.37.6
 
 VERSION=${VERSION} scripts/electron-rebuild.sh
 
-./node_modules/.bin/electron-packager dist/cncjs \
+./node_modules/.bin/electron-packager dist/cnc \
  --out=output \
  --overwrite \
  --platform=${PLATFORM} \

scripts/electron-rebuild.sh

@@ -2,15 +2,15 @@
 
 VERSION=${VERSION}
 
-pushd dist/cncjs
+pushd dist/cnc
 npm install --production
 popd
 
-rm -f dist/cncjs/node_modules/serialport/build/Release/serialport.node
+rm -f dist/cnc/node_modules/serialport/build/Release/serialport.node
 
 ./node_modules/.bin/electron-rebuild \
  --version=${VERSION} \
  --pre-gyp-fix \
- --module-dir=dist/cncjs/node_modules \
+ --module-dir=dist/cnc/node_modules \
  --electron-prebuilt-dir=node_modules/electron-prebuilt/ \
  --which-module=serialport

scripts/travis-release-darwin-x64.sh

@@ -6,7 +6,7 @@ if [[ -z "$FILE" ]]; then
  exit 1;
 fi
 
-RELEASE="cncjs-${TRAVIS_TAG:-${TRAVIS_BRANCH:-latest}}"
+RELEASE="cnc-${TRAVIS_TAG:-${TRAVIS_BRANCH:-latest}}"
 DESCRIPTION=`git log -1 --date=iso`
 
 scripts/github-release.sh \

scripts/travis-release-linux-x64.sh

@@ -6,7 +6,7 @@ if [[ -z "$FILE" ]]; then
  exit 1;
 fi
 
-RELEASE="cncjs-${TRAVIS_TAG:-${TRAVIS_BRANCH:-latest}}"
+RELEASE="cnc-${TRAVIS_TAG:-${TRAVIS_BRANCH:-latest}}"
 DESCRIPTION=`git log -1 --date=iso`
 
 scripts/github-release.sh \

src/package.json

@@ -1,5 +1,5 @@
 {
- "name": "cncjs",
+ "name": "cnc",
  "version": "1.1.0",
  "description": "A web-based CNC milling controller for the Arduino running GRBL",
  "homepage": "https://github.com/cheton/cnc",
@@ -70,4 +70,4 @@
  "webappengine": "~0.8.1",
  "winston": "~2.2.0"
  }
-}
+}

src/web/config/settings.js

@@ -6,7 +6,7 @@ const settings = {
  version: root.app.config.version,
  webroot: root.app.config.webroot,
  cdn: root.app.config.cdn,
- name: 'cncjs',
+ name: 'cnc',
  log: {
  level: 'warn', // trace, debug, info, warn, error
  logger: 'console', // console