Skip to content

Commit e34e003

Browse files
committed
Fix scripts order
1 parent 73643f8 commit e34e003

File tree

3 files changed

+42
-26
lines changed

3 files changed

+42
-26
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
"private": false,
2020
"scripts": {
2121
"postinstall": "node --no-warnings scripts/install.js",
22-
"start": "node --no-warnings src/index.js",
22+
"setup": "node --no-warnings scripts/setup.js",
2323
"cleanup": "node --no-warnings scripts/cleanup.js",
24+
"start": "node --no-warnings src/index.js",
2425
"test": "mocha"
2526
},
2627
"engines": {

scripts/install.js

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,15 @@
11
const fs = require('fs').promises;
22

3-
const questions = require('../src/questionnaire/questions');
43
const settings = require('../src/settings');
54

65
/**
7-
* Install function for the package, it set up the github auth details
8-
* TODO Consider the case for a previous auth file with different tokens
6+
* Install function for the package, it set up all the settings details
97
*/
108
(async () => {
11-
let user;
129
try {
1310
await fs.access(settings.settingsPath);
1411
await settings.load();
1512
} catch (e) {
1613
settings.update();
1714
}
18-
19-
const authFileAnswers = await questions.promptSettingsFile(settings.settingsPath);
20-
settings.settingsPath = authFileAnswers.settingsPath;
21-
22-
try {
23-
user = await settings.firstUser();
24-
} catch (e) {
25-
// console.log('fixme');
26-
}
27-
28-
29-
const authUser = await questions.promptGithubUser(user.user || '');
30-
const authToken = await questions.promptAuthToken(user.user || '', user.token || '');
31-
32-
settings.githubAuth = {
33-
user: authUser.github.user,
34-
token: authToken.github.token,
35-
};
36-
37-
await settings.update();
38-
console.log(`Your settings file was updated on ${settings.settingsPath}`);
3915
})();

scripts/setup.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
const fs = require('fs').promises;
2+
3+
const questions = require('../src/questionnaire/questions');
4+
const settings = require('../src/settings');
5+
6+
/**
7+
* Install function for the package, it set up the github auth details
8+
* TODO Consider the case for a previous auth file with different tokens
9+
*/
10+
(async () => {
11+
let user;
12+
try {
13+
await fs.access(settings.settingsPath);
14+
await settings.load();
15+
} catch (e) {
16+
settings.update();
17+
}
18+
19+
const authFileAnswers = await questions.promptSettingsFile(settings.settingsPath);
20+
settings.settingsPath = authFileAnswers.settingsPath;
21+
22+
try {
23+
user = await settings.firstUser();
24+
} catch (e) {
25+
// console.log('fixme');
26+
}
27+
28+
29+
const authUser = await questions.promptGithubUser(user.user || '');
30+
const authToken = await questions.promptAuthToken(user.user || '', user.token || '');
31+
32+
settings.githubAuth = {
33+
user: authUser.github.user,
34+
token: authToken.github.token,
35+
};
36+
37+
await settings.update();
38+
console.log(`Your settings file was updated on ${settings.settingsPath}`);
39+
})();

0 commit comments

Comments
 (0)