X-Git-Url: https://git.r.bdr.sh/rbdr/blog/blobdiff_plain/b0c3bb911306b2468152cf8a83c28eca843b7647..0307770b088afcc207bc5d84c63f8b681db0aebf:/lib/remotes/git.js?ds=sidebyside diff --git a/lib/remotes/git.js b/lib/remotes/git.js index c894122..75ef43e 100644 --- a/lib/remotes/git.js +++ b/lib/remotes/git.js @@ -1,12 +1,12 @@ -const { exec } = require('child_process'); -const { promisify } = require('util'); +import { exec } from 'child_process'; +import { promisify } from 'util'; const internals = { // Promisified functions - exec: promisify(exec), + exec: promisify(exec) }; -module.exports = { +export default { canHandle() { // For the future: actually check if it's a valid git url @@ -15,7 +15,7 @@ module.exports = { async syncUp(remote, blogDirectory) { - await internals.exec(`cd ${blogDirectory} && git init`); + await internals.exec(`cd ${blogDirectory} && git init -b main`); await internals.exec(`cd ${blogDirectory} && git add .`); await internals.exec(`cd ${blogDirectory} && git commit --allow-empty -m blog-sync-up-${Date.now()}`); await internals.exec(`cd ${blogDirectory} && git push ${remote} main --force`); @@ -23,12 +23,13 @@ module.exports = { async syncDown(remote, blogDirectory) { - await internals.exec(`cd ${blogDirectory} && git init`); + await internals.exec(`cd ${blogDirectory} && git init -b main`); try { await internals.exec(`cd ${blogDirectory} && git checkout .`); } catch {} + await internals.exec(`cd ${blogDirectory} && git clean . -f`); await internals.exec(`cd ${blogDirectory} && git pull ${remote} main`); } -} +};