rdesktop2
filip mertens 1 year ago
parent c0cc7328ef
commit 3e610699cc
  1. 5
      apps/remixdesktop/src/plugins/isoGitPlugin.ts
  2. 26
      apps/remixdesktop/src/tools/git.ts

@ -147,6 +147,11 @@ class IsoGitPluginClient extends ElectronBasePluginClient {
async commit(cmd: any) {
if (this.gitIsInstalled) {
const status = await gitProxy.commit(this.workingDir, cmd.message)
return status
}
const commit = await git.commit({
...await this.getGitConfig(),
...cmd

@ -44,7 +44,7 @@ export const gitProxy = {
},
async push(path: string, remote: string, src: string, branch: string, force: boolean = false) {
const { stdout, stderr } = await execAsync(`git push ${force? ' -f':'' } ${remote} ${src}:${branch}`, { cwd: path });
const { stdout, stderr } = await execAsync(`git push ${force ? ' -f' : ''} ${remote} ${src}:${branch}`, { cwd: path });
},
async pull(path: string, remote: string, src: string, branch: string) {
@ -55,6 +55,14 @@ export const gitProxy = {
const { stdout, stderr } = await execAsync(`git fetch ${remote} ${branch}`, { cwd: path });
},
async commit(path: string, message: string) {
await execAsync(`git commit -m ${message}`, { cwd: path });
const { stdout, stderr } = await execAsync(`git rev-parse HEAD`, { cwd: path });
return stdout;
},
status: async (path: string) => {
const result = await execAsync('git status --porcelain -uall', { cwd: path })
@ -131,13 +139,13 @@ export const gitProxy = {
}
}
function normalizeJson(str: string){
function normalizeJson(str: string) {
return str.replace(/[\s\n\r\t]/gs, '').replace(/,([}\]])/gs, '$1')
.replace(/([,{\[]|)(?:("|'|)([\w_\- ]+)\2:|)("|'|)(.*?)\4([,}\]])/gs, (str, start, q1, index, q2, item, end) => {
item = item.replace(/"/gsi, '').trim();
if(index){index = '"'+index.replace(/"/gsi, '').trim()+'"';}
if(!item.match(/^[0-9]+(\.[0-9]+|)$/) && !['true','false'].includes(item)){item = '"'+item+'"';}
if(index){return start+index+':'+item+end;}
return start+item+end;
});
.replace(/([,{\[]|)(?:("|'|)([\w_\- ]+)\2:|)("|'|)(.*?)\4([,}\]])/gs, (str, start, q1, index, q2, item, end) => {
item = item.replace(/"/gsi, '').trim();
if (index) { index = '"' + index.replace(/"/gsi, '').trim() + '"'; }
if (!item.match(/^[0-9]+(\.[0-9]+|)$/) && !['true', 'false'].includes(item)) { item = '"' + item + '"'; }
if (index) { return start + index + ':' + item + end; }
return start + item + end;
});
}

Loading…
Cancel
Save