Skip to content

Commit

Permalink
Fixed compilation error with empty plugins and incorrect import (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fg123 @MichaelKim
fg123 authored and MichaelKim committed May 1, 2018
1 parent 2885903 commit f830d37
Show file tree
Hide file tree
Showing 4 changed files with 197 additions and 221 deletions.
220 changes: 106 additions & 114 deletions src/background/setup.js
View file
Original file line number Diff line number Diff line change
@@ -1,130 +1,122 @@
/* @flow */

import { * } from '../constants';
import { Constants } from 'constants.js';

let script: {
output: string => void,
writeFile: (string, string) => void,
exec: (string, ?Function) => void
output: string => void,
writeFile: (string, string) => void,
exec: (string, ?Function) => void
};

let resolve: any => void;

function setupFile(script, args, resolve) {
function getData(url) {
return fetch(url).then(res => res.text());
}
function getData(url) {
return fetch(url).then(res => res.text());
}

function createMan(command, desc, usage) {
script.output('Creating manpage for ' + command);
let s = '## ' + command;
if (desc.length > 0) {
s += '\n\n' + desc;
}
if (usage.length > 0) {
s += '\n\nUsage:\n' + usage.join('\n');
}
script.writeFile('~/.man/' + command, s);
}
function createMan(command, desc, usage) {
script.output('Creating manpage for ' + command);
let s = '## ' + command;
if (desc.length > 0) {
s += '\n\n' + desc;
}
if (usage.length > 0) {
s += '\n\nUsage:\n' + usage.join('\n');
}
script.writeFile('~/.man/' + command, s);
}

script.output('Setting up man directory...');
script.output('====================================');
script.exec('cd');
script.exec('mkdir .man');
script.output('====================================');
script.output('\n');
script.output('Setting up man directory...');
script.output('====================================');
script.exec('cd');
script.exec('mkdir .man');
script.output('====================================');
script.output('\n');

script.output('Retrieving latest Mercury Module Manager (mmm)...');
script.output('====================================');
const mmmUrl = Constants.MERCURYWM_URL + 'modules/mmm/';
getData(mmmUrl + 'VERSION').then(version => {
getData(mmmUrl + version + '/main.js').then(code => {
// $FlowFixMe: "Function" isn't callable
Function('script', 'args', 'resolve', code)(
Object.assign({}, script, { output: () => {} }),
['install', 'mmm'],
() => {}
);
script.output('Installed mmm@' + version);
script.output('====================================');
script.output('\n');
script.output('Retrieving latest Mercury Module Manager (mmm)...');
script.output('====================================');
const mmmUrl = Constants.MERCURYWM_URL + 'modules/mmm/';
getData(mmmUrl + 'VERSION').then(version => {
getData(mmmUrl + version + '/main.js').then(code => {
// $FlowFixMe: "Function" isn't callable
Function('script', 'args', 'resolve', code)(
Object.assign({}, script, { output: () => {} }),
['install', 'mmm'],
() => {}
);
script.output('Installed mmm@' + version);
script.output('====================================');
script.output('\n');

script.output('Installing man...');
script.output('====================================');
script.exec('mmm install man', () => {});
// install automatically makes the =========== border
script.output('\n');
script.output('Installing man...');
script.output('====================================');
script.exec('mmm install man', () => {});
// install automatically makes the =========== border
script.output('\n');

script.output('Creating system man pages...');
script.output('====================================');
script.exec('cd .man');
createMan('reset', 'Resets MercuryWM, will destroy all user files!', []);
createMan('clear', 'Clears the current terminal output.', []);
createMan('env', "Set's environment variables.", [
'env - Lists all environment variables',
"env [var] - Output's variable value",
"env [var] [value] - Set's variable value"
]);
createMan(
'window',
'Manipulates windows on the screen. Window id is the first number (not in parentheses) at the bottom of the window in the black bar.',
[
'window vs - Splits current window in half vertically',
'window hs - Splits current window in half horizontally',
'window merge [id] - Merge current window with the window given; windows must share a same-length common edge',
'window merge [id1] [id2] - Merges the two windows given; windows must share a same-length common edge',
"window [left | right | top | bottom] [value] - Moves window's given edge by given value; windows must share a same-length common edge",
'window list - Lists all the windows in the current workspace'
]
);
createMan('workspace', 'Manipulates workspaces in the environment.', [
'workspace add - Adds a workspace',
'workspace remove [index] - Removes given workspace (will reset current workspace to 0)'
]);
createMan('cd', 'Changes current working directory.', [
'cd - Goes to root (~) directory',
'cd [path] - Navigates to given relative path'
]);
createMan('ls', '', [
'ls - Lists files and directories in current working directory',
'ls -a - Also shows hidden files and directories'
]);
createMan('mkdir', '', [
'mkdir [name] - Creates a directory in current working directory'
]);
createMan('cat', '', [
'cat [name] - Outputs the file contents to the screen'
]);
createMan('edit', '', [
'edit [name] - Simple editor to edit contents of a file'
]);
createMan('yum', 'Network downloader', [
"yum - Outputs 'spaghetti sauce'",
'yum [url] [file] - Downloads a file and writes the contents to a local file'
]);
createMan('rm', '', [
'rm [file] - Removes file or directory',
'rm -f [file] - Removes file',
'rm -d [file] - Removes directory'
]);
createMan('backup', '', [
'backup save - Writes a backup of the current state of Mercury into the console',
'backup restore - Restores Mercury from a backup created by "backup save"'
]);
createMan('render', '', [
'render - Renders nothing (Makes the window blank)',
'render [HTML filepath] - Renders the HTML file',
'render [HTML filepath] [JS filepath] - Renders the HTML file and executes the JS file'
]);
script.exec('cd ..');
script.output('====================================');
script.output('\n');
script.output('Setup has successfully completed.');
resolve();
});
});
script.output('Creating system man pages...');
script.output('====================================');
script.exec('cd .man');
createMan('reset', 'Resets MercuryWM, will destroy all user files!', []);
createMan('clear', 'Clears the current terminal output.', []);
createMan('env', "Set's environment variables.", [
'env - Lists all environment variables',
"env [var] - Output's variable value",
"env [var] [value] - Set's variable value"
]);
createMan(
'window',
'Manipulates windows on the screen. Window id is the first number (not in parentheses) at the bottom of the window in the black bar.',
[
'window vs - Splits current window in half vertically',
'window hs - Splits current window in half horizontally',
'window merge [id] - Merge current window with the window given; windows must share a same-length common edge',
'window merge [id1] [id2] - Merges the two windows given; windows must share a same-length common edge',
"window [left | right | top | bottom] [value] - Moves window's given edge by given value; windows must share a same-length common edge",
'window list - Lists all the windows in the current workspace'
]
);
createMan('workspace', 'Manipulates workspaces in the environment.', [
'workspace add - Adds a workspace',
'workspace remove [index] - Removes given workspace (will reset current workspace to 0)'
]);
createMan('cd', 'Changes current working directory.', [
'cd - Goes to root (~) directory',
'cd [path] - Navigates to given relative path'
]);
createMan('ls', '', [
'ls - Lists files and directories in current working directory',
'ls -a - Also shows hidden files and directories'
]);
createMan('mkdir', '', ['mkdir [name] - Creates a directory in current working directory']);
createMan('cat', '', ['cat [name] - Outputs the file contents to the screen']);
createMan('edit', '', ['edit [name] - Simple editor to edit contents of a file']);
createMan('yum', 'Network downloader', [
"yum - Outputs 'spaghetti sauce'",
'yum [url] [file] - Downloads a file and writes the contents to a local file'
]);
createMan('rm', '', [
'rm [file] - Removes file or directory',
'rm -f [file] - Removes file',
'rm -d [file] - Removes directory'
]);
createMan('backup', '', [
'backup save - Writes a backup of the current state of Mercury into the console',
'backup restore - Restores Mercury from a backup created by "backup save"'
]);
createMan('render', '', [
'render - Renders nothing (Makes the window blank)',
'render [HTML filepath] - Renders the HTML file',
'render [HTML filepath] [JS filepath] - Renders the HTML file and executes the JS file'
]);
script.exec('cd ..');
script.output('====================================');
script.output('\n');
script.output('Setup has successfully completed.');
resolve();
});
});
}

export default '(' +
setupFile.toString() +
')(script, args, resolve); return true;';
export default '(' + setupFile.toString() + ')(script, args, resolve); return true;';
7 changes: 4 additions & 3 deletions src/constants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import type { Directory, File, Terminal, Window, Workspace } from 'types';

const MERCURY_BASE_URL = 'https://wheel-org.github.io/mercurywm-scripts/';

/* Constants */
const Constants = {
NAME: 'Mercury WM',
Expand All @@ -10,9 +12,8 @@ const Constants = {
DIR_TYPE: 'dir',
FILE_TYPE: 'file',
EXE_TYPE: 'exe',
MERCURYWM_URL: 'https://wheel-org.github.io/mercurywm-scripts/',
MERCURYWM_CONTENT_URL: MERCURYWM_URL + 'extensions/',
MERCURYWM_CONTENT_ORIGIN: MERCURYWM_URL,
MERCURYWM_URL: MERCURY_BASE_URL,
MERCURYWM_CONTENT_URL: MERCURY_BASE_URL + 'extensions/',

// KEY CODES
KEY_LEFT_ARROW: 37,
Expand Down
Loading

0 comments on commit f830d37

Please sign in to comment.