From fcb4d7d3fe8e5b18cffdf765a0047d85202bb569 Mon Sep 17 00:00:00 2001
From: TheGoddessInari <thegoddessinari@gmail.com>
Date: Mon, 6 Aug 2018 17:44:14 -0700
Subject: [PATCH] Cleanup npm commands to be more sensible.

Now they're more akin to how other builds work.
clean = clean build dir
distclean = remove distribution dir.
---
 package.json | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 7ea6ac1e..509626d6 100644
--- a/package.json
+++ b/package.json
@@ -4,13 +4,13 @@
 		"start": "electron electron/main.js",
 		"start:debug": "electron electron/main.js --enable-logging",
 		"test": "./node_modules/.bin/mocha test/tests/**/*.spec.js",
-		"sencha:clean": "rimraf ./build/production",
-		"sencha:compile": "sencha app build && cpy app/package.json build/production/Rambox/",
-		"sencha:recompile": "npm run sencha:clean && npm run sencha:compile",
-		"clean": "rimraf ./dist",
-		"clean:win": "rimraf ./dist/win-{ia32-,}unpacked",
-		"clean:linux": "rimraf ./dist/linux-{ia32-,}unpacked",
-		"clean:osx": "rimraf ./dist/macos-unpacked",
+		"clean": "rimraf ./build/production",
+		"compile": "sencha app build && cpy app/package.json build/production/Rambox/",
+		"recompile": "npm run distclean && npm run compile",
+		"distclean": "rimraf ./dist",
+		"distclean:win": "rimraf ./dist/win-{ia32-,}unpacked",
+		"distclean:linux": "rimraf ./dist/linux-{ia32-,}unpacked",
+		"distclean:osx": "rimraf ./dist/macos-unpacked",
 		"pack": "electron-builder --dir",
 		"pack:osx": "electron-builder --macos --dir",
 		"pack:win": "electron-builder --win --ia32 --x64 --dir",
@@ -29,22 +29,22 @@
 		"build:win32": "electron-builder --win --ia32",
 		"build:win64": "electron-builder --win --x64",
 		"build:all": "electron-builder -mwl --ia32 --x64",
-		"setup": "npm run sencha:clean && npm run sencha:compile && npm run build",
-		"setup:osx": "npm run sencha:clean && npm run sencha:compile && npm run build:osx",
-		"setup:win": "npm run sencha:clean && npm run sencha:compile && npm run build:win",
-		"setup:win32": "npm run sencha:clean && npm run sencha:compile && npm run build:win32",
-		"setup:win64": "npm run sencha:clean && npm run sencha:compile && npm run build:win64",
-		"setup:linux": "npm run sencha:clean && npm run sencha:compile && npm run build:linux",
-		"setup:linux32": "npm run sencha:clean && npm run sencha:compile && npm run build:linux32",
-		"setup:linux64": "npm run sencha:clean && npm run sencha:compile && npm run build:linux64",
-		"repack": "npm run sencha:clean && npm run sencha:compile && npm run clean && npm run pack",
-		"repack:osx": "npm run sencha:clean && npm run sencha:compile && npm run clean:osx && npm run pack:macos",
-		"repack:win": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win",
-		"repack:win32": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win32",
-		"repack:win64": "npm run sencha:clean && npm run sencha:compile && npm run clean:win && npm run pack:win64",
-		"repack:linux": "npm run sencha:clean && npm run sencha:compile && npm run clean:linux && npm run pack:linux",
-		"repack:linux32": "npm run sencha:clean && npm run sencha:compile && npm run clean:linux && npm run pack:linux32",
-		"repack:linux64": "npm run sencha:clean && npm run sencha:compile && npm run clean:linux && npm run pack:linux64",
+		"setup": "npm run clean && npm run compile && npm run build",
+		"setup:osx": "npm run clean && npm run compile && npm run build:osx",
+		"setup:win": "npm run clean && npm run compile && npm run build:win",
+		"setup:win32": "npm run clean && npm run compile && npm run build:win32",
+		"setup:win64": "npm run clean && npm run compile && npm run build:win64",
+		"setup:linux": "npm run clean && npm run compile && npm run build:linux",
+		"setup:linux32": "npm run clean && npm run compile && npm run build:linux32",
+		"setup:linux64": "npm run clean && npm run compile && npm run build:linux64",
+		"repack": "npm run clean && npm run compile && npm run distclean && npm run pack",
+		"repack:osx": "npm run clean && npm run compile && npm run distclean:osx && npm run pack:macos",
+		"repack:win": "npm run clean && npm run compile && npm run distclean:win && npm run pack:win",
+		"repack:win32": "npm run clean && npm run compile && npm run distclean:win && npm run pack:win32",
+		"repack:win64": "npm run clean && npm run compile && npm run distclean:win && npm run pack:win64",
+		"repack:linux": "npm run clean && npm run compile && npm run distclean:linux && npm run pack:linux",
+		"repack:linux32": "npm run clean && npm run compile && npm run distclean:linux && npm run pack:linux32",
+		"repack:linux64": "npm run clean && npm run compile && npm run distclean:linux && npm run pack:linux64",
 		"dist": "npm run repack"
 	},
 	"build": {