Skip to content

Commit 2175be2

Browse files
alqmcalqmc
authored andcommitted
fix: update lost users
1 parent 33a6235 commit 2175be2

File tree

8 files changed

+31
-26
lines changed

8 files changed

+31
-26
lines changed

dist/main.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
1414
var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
1515

1616
var name = "gacm";
17-
var version$1 = "1.0.0";
17+
var version$1 = "1.0.1";
1818
var description = "git account manage";
1919
var keywords = [
2020
"git",
@@ -69,15 +69,19 @@ const baseAction = async (cmd) => {
6969
};
7070

7171
const rootPath = __dirname;
72-
const outputPath = __dirname;
72+
__dirname;
7373
path.resolve(rootPath, "package");
74-
const registriesPath = path.resolve(outputPath, "registries.json");
74+
const HOME = process.env[process.platform === "win32" ? "USERPROFILE" : "HOME"] || "";
75+
const registriesPath = path.join(HOME, ".gacmrc");
7576

7677
const { readFile, writeFile } = fs.promises;
7778
const getFileUser = async (rootPath) => {
78-
const fileBuffer = await readFile(rootPath, "utf-8");
79-
const userList = fileBuffer ? JSON.parse(fileBuffer.toString()) : null;
80-
return userList;
79+
if (fs.existsSync(rootPath)) {
80+
const fileBuffer = await readFile(rootPath, "utf-8");
81+
const userList = fileBuffer ? JSON.parse(fileBuffer.toString()) : null;
82+
return userList;
83+
}
84+
return null;
8185
};
8286
async function writeFileUser(dir, data) {
8387
writeFile(dir, JSON.stringify(data, null, 4)).catch((error) => {
@@ -185,7 +189,7 @@ const deleteAction = async (name) => {
185189
if (!userList[name])
186190
return log.error(`${name} not found`);
187191
delete userList[name];
188-
await writeFileUser(path.resolve(outputPath, `registries.json`), userList);
192+
await writeFileUser(registriesPath, userList);
189193
log.success(`[delete]: ${name}`);
190194
};
191195
const insertUser = async (name, email) => {
@@ -196,7 +200,7 @@ const insertUser = async (name, email) => {
196200
name,
197201
email
198202
};
199-
await writeFileUser(path.resolve(outputPath, `registries.json`), userList);
203+
await writeFileUser(registriesPath, userList);
200204
};
201205

202206
const program = new commander.Command();

dist/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gacm",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"private": false,
55
"description": "git account manage",
66
"keywords": [

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gacm",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "gacm",
55
"scripts": {
66
"build": "gulp --require sucrase/register/ts --gulpfile build/gulpfile.ts",

package/commands/useAction/index.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
/* eslint-disable no-console */
2-
import { resolve } from 'path';
31
import { green } from 'kolorist';
4-
import { outputPath, registriesPath } from '../../config/path';
2+
import { registriesPath } from '../../config/path';
53
import { getFileUser, writeFileUser } from '../../utils/getUserList';
64
import { execCommand, run } from '../../utils/shell';
75
import { geneDashLine, printMessages } from '../../utils/tools';
@@ -72,7 +70,7 @@ export const deleteAction = async (name: string) => {
7270
if (!userList) return log.error(`no user`);
7371
if (!userList[name]) return log.error(`${name} not found`);
7472
delete userList[name];
75-
await writeFileUser(resolve(outputPath, `registries.json`), userList);
73+
await writeFileUser(registriesPath, userList);
7674
log.success(`[delete]: ${name}`);
7775
};
7876

@@ -84,5 +82,5 @@ export const insertUser = async (name: string, email: string) => {
8482
name,
8583
email,
8684
};
87-
await writeFileUser(resolve(outputPath, `registries.json`), userList);
85+
await writeFileUser(registriesPath, userList);
8886
};

package/config/path.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// 基于打包后的路径 dist
2-
import { resolve } from 'path';
2+
import { join, resolve } from 'path';
33
export const rootPath = __dirname;
44
export const outputPath = __dirname;
55
export const enterPath = resolve(rootPath, 'package');
6-
7-
export const registriesPath = resolve(outputPath, 'registries.json');
6+
export const HOME =
7+
process.env[process.platform === 'win32' ? 'USERPROFILE' : 'HOME'] || '';
8+
export const registriesPath = join(HOME, '.gacmrc');

package/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gacm",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"private": false,
55
"description": "git account manage",
66
"keywords": [

package/registries.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

package/utils/getUserList.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { promises } from 'fs';
1+
import { existsSync, promises } from 'fs';
22
import { log } from './log';
33
import type { UserInfoJson } from '../type/shell.type';
44
const { readFile, writeFile } = promises;
@@ -9,11 +9,14 @@ const { readFile, writeFile } = promises;
99
* @returns
1010
*/
1111
export const getFileUser = async (rootPath: string) => {
12-
const fileBuffer = await readFile(rootPath, 'utf-8');
13-
const userList = fileBuffer
14-
? (JSON.parse(fileBuffer.toString()) as UserInfoJson)
15-
: null;
16-
return userList;
12+
if (existsSync(rootPath)) {
13+
const fileBuffer = await readFile(rootPath, 'utf-8');
14+
const userList = fileBuffer
15+
? (JSON.parse(fileBuffer.toString()) as UserInfoJson)
16+
: null;
17+
return userList;
18+
}
19+
return null;
1720
};
1821

1922
/**

0 commit comments

Comments
 (0)