Comparing version
{ | ||
"name": "git-pwa", | ||
"version": "1.0.15", | ||
"version": "1.0.16", | ||
"description": "git to use in a progressive web app", | ||
@@ -5,0 +5,0 @@ "bin": { |
@@ -98,3 +98,3 @@ import fs from 'fs'; | ||
} else { | ||
if(aFile[0] == ".env"){ | ||
if (aFile[0] == ".env") { | ||
fs.writeFileSync(`${oConfig.dir}/.gitignore`, ".env\nnode_modules\n"); | ||
@@ -117,14 +117,14 @@ aFile[0] = ".gitignore"; | ||
}, | ||
branch: async(oConfig) =>{ | ||
branch: async (oConfig) => { | ||
return await this.branchAndSetMergeRef(oConfig); | ||
}, | ||
checkout: async(oConfig) =>{ | ||
if(this.argv["b"]){ | ||
checkout: async (oConfig) => { | ||
if (this.argv["b"]) { | ||
oConfig.ref = this.argv["b"]; | ||
await this.branchAndSetMergeRef(oConfig); | ||
}else{ | ||
} else { | ||
oConfig.ref = this.argv._[3] || this.base.ref; | ||
oConfig.noUpdateHead = true; | ||
oConfig.force = true; | ||
await git.checkout(oConfig); | ||
@@ -137,3 +137,3 @@ } | ||
init: async (oConfig) => { | ||
if(fs.existsSync(`${oConfig.dir}/.env`)){ | ||
if (fs.existsSync(`${oConfig.dir}/.env`)) { | ||
fs.writeFileSync(`${oConfig.dir}/.gitignore`, ".env\nnode_modules\n"); | ||
@@ -145,3 +145,3 @@ } | ||
return filelist.join('\n'); | ||
}, | ||
}, | ||
push: async (oConfig) => { | ||
@@ -167,3 +167,3 @@ if (this.argv["u"]) { | ||
filelist.push(`add remote ${oConfig.remote} ${oConfig.url}`); | ||
}else if (this.argv._[3] == 'remove'){ | ||
} else if (this.argv._[3] == 'remove') { | ||
oConfig.remote = this.argv._[4]; | ||
@@ -173,3 +173,3 @@ await git.deleteRemote(oConfig); | ||
} | ||
return(filelist.join('\n')); | ||
return (filelist.join('\n')); | ||
}, | ||
@@ -203,3 +203,3 @@ status: async (oConfig) => { | ||
let filelist = ['', `on branch ${oConfig.ref}`]; | ||
filelist.push(`${this.argv._[2]} complete ${rc?rc:""}`); | ||
filelist.push(`${this.argv._[2]} complete ${rc ? rc : ""}`); | ||
return filelist.join('\n'); | ||
@@ -233,6 +233,6 @@ } else { | ||
bChangedUnadded = true; | ||
if(aFile[0] == ".env"){ | ||
if (aFile[0] == ".env") { | ||
fs.writeFileSync(`${oConfig.dir}/.gitignore`, ".env\nnode_modules\n"); | ||
console.log(".gitignore"); | ||
}else{ | ||
} else { | ||
console.log(aFile[0]); | ||
@@ -251,3 +251,3 @@ } | ||
} | ||
async branchAndSetMergeRef(oConfig){ | ||
async branchAndSetMergeRef(oConfig) { | ||
oConfig.object = "HEAD"; | ||
@@ -259,22 +259,23 @@ await git.branch(oConfig); | ||
const sNewHeadFile = `${oConfig.dir}/.git/${sNewHeadBranch}` | ||
try{ | ||
if(fs.existsSync(sOldHeadFile)){ | ||
try { | ||
if (fs.existsSync(sOldHeadFile)) { | ||
await fs.promises.rename(sOldHeadFile, sNewHeadFile); | ||
}else if(!fs.existsSync(sNewHeadFile)){ | ||
throw(`no head file ${sOldHeadFile}`); | ||
} else if (!fs.existsSync(sNewHeadFile)) { | ||
throw (`no head file ${sOldHeadFile}`); | ||
} | ||
const sHeadRef = `${oConfig.dir}/.git/HEAD`; | ||
if(fs.existsSync(sHeadRef)){ | ||
if (fs.existsSync(sHeadRef)) { | ||
await fs.promises.writeFile(sHeadRef, `ref: refs/heads/${sNewHeadBranch}\n`); | ||
} | ||
this.config[`branch "${oConfig.ref}"`] = {merge:`refs/head/${oConfig.ref}`}; | ||
this.config[`branch "${oConfig.ref}"`] = { merge: `refs/head/${oConfig.ref}` }; | ||
fs.writeFileSync( | ||
`${this.base.dir}/${this.base.gitdir}/config`, | ||
ini.stringify(this.config) | ||
`${this.base.dir}/${this.base.gitdir}/config`, | ||
ini.stringify(this.config) | ||
); | ||
let filelist = ['', `on branch ${await git.currentBranch(this.base)}`]; | ||
filelist.push("branched"); | ||
}catch{ | ||
filelist.push("branched"); | ||
return (filelist.join("\n")); | ||
} catch { | ||
// maybe a git init will work | ||
if(fs.existsSync(`${oConfig.dir}/.env`)){ | ||
if (fs.existsSync(`${oConfig.dir}/.env`)) { | ||
fs.writeFileSync(`${oConfig.dir}/.gitignore`, ".env\nnode_modules\n"); | ||
@@ -287,6 +288,6 @@ } | ||
return filelist.join('\n'); | ||
} | ||
return (filelist.join("\n")); | ||
} | ||
} | ||
} |
15593
0.21%