diff --git a/uninstall/.angular-cli.json b/uninstall/.angular-cli.json
new file mode 100644
index 00000000..e31faf7a
--- /dev/null
+++ b/uninstall/.angular-cli.json
@@ -0,0 +1,15 @@
+{
+ "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+ "project": {
+ "name": "uninstall"
+ },
+ "test": {
+ "karma": {
+ "config": "./karma.conf.js"
+ }
+ },
+ "defaults": {
+ "styleExt": "css",
+ "component": {}
+ }
+}
diff --git a/uninstaller/.babelrc b/uninstall/.babelrc
similarity index 100%
rename from uninstaller/.babelrc
rename to uninstall/.babelrc
diff --git a/uninstaller/.editorconfig b/uninstall/.editorconfig
similarity index 100%
rename from uninstaller/.editorconfig
rename to uninstall/.editorconfig
diff --git a/uninstaller/.gitignore b/uninstall/.gitignore
similarity index 100%
rename from uninstaller/.gitignore
rename to uninstall/.gitignore
diff --git a/uninstall/README.md b/uninstall/README.md
new file mode 100644
index 00000000..316df265
--- /dev/null
+++ b/uninstall/README.md
@@ -0,0 +1 @@
+# Uninstall
diff --git a/uninstaller/browser/.eslintrc.js b/uninstall/browser/.eslintrc.ts
similarity index 100%
rename from uninstaller/browser/.eslintrc.js
rename to uninstall/browser/.eslintrc.ts
diff --git a/uninstaller/browser/index.html b/uninstall/browser/index.html
similarity index 100%
rename from uninstaller/browser/index.html
rename to uninstall/browser/index.html
diff --git a/uninstaller/gulp-tasks/common.ts b/uninstall/gulp-tasks/common.ts
similarity index 100%
rename from uninstaller/gulp-tasks/common.ts
rename to uninstall/gulp-tasks/common.ts
diff --git a/uninstaller/gulp-tasks/config.ts b/uninstall/gulp-tasks/config.ts
similarity index 100%
rename from uninstaller/gulp-tasks/config.ts
rename to uninstall/gulp-tasks/config.ts
diff --git a/uninstaller/gulpfile.ts b/uninstall/gulpfile.ts
similarity index 97%
rename from uninstaller/gulpfile.ts
rename to uninstall/gulpfile.ts
index b5303a78..8617b3cc 100644
--- a/uninstaller/gulpfile.ts
+++ b/uninstall/gulpfile.ts
@@ -1,8 +1,11 @@
'use strict';
+// import gulp from 'gulp';
var gulp = require('gulp'),
+ fs = require('fs-extra'),
babel = require('gulp-babel'),
runSequence = require('run-sequence'),
+ request = require('request'),
del = require('del'),
exec = require('child_process').exec,
pjson = require('./package.json'),
@@ -13,6 +16,7 @@ var gulp = require('gulp'),
symlink = require('gulp-symlink'),
common = require('./gulp-tasks/common'),
config = require('./gulp-tasks/config'),
+ yargs = require('yargs');
diff --git a/uninstaller/karma.conf.js b/uninstall/karma.conf.js
similarity index 100%
rename from uninstaller/karma.conf.js
rename to uninstall/karma.conf.js
diff --git a/uninstaller/main/index.ts b/uninstall/main/index.ts
similarity index 62%
rename from uninstaller/main/index.ts
rename to uninstall/main/index.ts
index 576a92d1..b71bb578 100644
--- a/uninstaller/main/index.ts
+++ b/uninstall/main/index.ts
@@ -9,20 +9,6 @@ ipcMain.on('crash', function(event, arg) {
process.crash(arg);
});
-// Rebroadcasts installComplete event from Renderer back to Renderer.
-// Bit of a hack, but it enables async messaging in UI.
-ipcMain.on('installComplete', (event, arg) => {
- event.sender.send('installComplete', arg);
-});
-
-ipcMain.on('downloadingComplete', (event, arg) => {
- event.sender.send('downloadingComplete', arg);
-});
-
-ipcMain.on('checkComplete', (event, arg) => {
- event.sender.send('checkComplete', arg);
-});
-
// Quit when all windows are closed.
app.on('window-all-closed', function() {
app.quit();
@@ -48,23 +34,12 @@ app.on('ready', function() {
// Load the index.html of the app
mainWindow.loadURL(`file://${baseLocation}/../browser/index.html`);
- // only for windows where 7zip pass location where self extracting archive
- // was unpacked
- if (process.platform === 'win32') {
- mainWindow.bundleTempFolder = process.argv.length > 1 ? process.argv[1].replace(/^--/, '') : undefined;
- }
-
- mainWindow.skipInstall = process.argv.filter(name => name == 'skipInstall').length == 1;
-
mainWindow.once('ready-to-show', () => {
mainWindow.show();
});
// Emitted when the window is closed.
mainWindow.on('closed', function() {
- // Dereference the window object, usually you would store windows
- // in an array if your app supports multi windows, this is the time
- // when you should delete the corresponding element.
mainWindow = null;
});
diff --git a/uninstaller/package.json b/uninstall/package.json
similarity index 85%
rename from uninstaller/package.json
rename to uninstall/package.json
index c54c4e39..6951f75d 100644
--- a/uninstaller/package.json
+++ b/uninstall/package.json
@@ -4,16 +4,8 @@
"version": "2.3.0-GA",
"description": "Red Hat Development Suite Installer",
"main": "main/index.js",
- "repository": {
- "type": "git",
- "url": "https://github.com/redhat-developer-tooling/developer-platform-install.git"
- },
"author": "Red Hat Developer Tooling Group",
"license": "Apache-2.0",
- "bugs": {
- "url": "https://github.com/redhat-developer-tooling/developer-platform-install/issues"
- },
- "homepage": "https://github.com/redhat-developer-tooling/developer-platform-install#readme",
"scripts": {
"start": "./node_modules/.bin/gulp",
"update-deps": "node_modules/.bin/ncu --upgrade --loglevel verbose --packageFile package.json && npm update"
diff --git a/uninstaller/protractor.conf.js b/uninstall/protractor.conf.js
similarity index 100%
rename from uninstaller/protractor.conf.js
rename to uninstall/protractor.conf.js
diff --git a/uninstaller/tsconfig.json b/uninstall/tsconfig.json
similarity index 100%
rename from uninstaller/tsconfig.json
rename to uninstall/tsconfig.json
diff --git a/uninstaller/tslint.json b/uninstall/tslint.json
similarity index 100%
rename from uninstaller/tslint.json
rename to uninstall/tslint.json
diff --git a/uninstaller/.angular-cli.json b/uninstaller/.angular-cli.json
deleted file mode 100644
index 76076d23..00000000
--- a/uninstaller/.angular-cli.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
- "project": {
- "name": "uninstaller"
- },
- "apps": [
- {
- "root": "src",
- "outDir": "dist",
- "assets": [
- "assets",
- "favicon.ico"
- ],
- "index": "index.html",
- "main": "main.ts",
- "polyfills": "polyfills.ts",
- "test": "test.ts",
- "tsconfig": "tsconfig.app.json",
- "testTsconfig": "tsconfig.spec.json",
- "prefix": "app",
- "styles": [
- "styles.css"
- ],
- "scripts": [],
- "environmentSource": "environments/environment.ts",
- "environments": {
- "dev": "environments/environment.ts",
- "prod": "environments/environment.prod.ts"
- }
- }
- ],
- "e2e": {
- "protractor": {
- "config": "./protractor.conf.js"
- }
- },
- "lint": [
- {
- "project": "src/tsconfig.app.json",
- "exclude": "**/node_modules/**"
- },
- {
- "project": "src/tsconfig.spec.json",
- "exclude": "**/node_modules/**"
- },
- {
- "project": "e2e/tsconfig.e2e.json",
- "exclude": "**/node_modules/**"
- }
- ],
- "test": {
- "karma": {
- "config": "./karma.conf.js"
- }
- },
- "defaults": {
- "styleExt": "css",
- "component": {}
- }
-}
diff --git a/uninstaller/README.md b/uninstaller/README.md
deleted file mode 100644
index e69de29b..00000000