Add blog status, correctly shift

[rbdr/blog] / lib / remotes / git.js

diff --git a/lib/remotes/git.js b/lib/remotes/git.js
index 11fdab89ddda38da508e6545c2e009ccbb49d1cc..75ef43ede2864ca68cd7070107abe9fa972bd42f 100644 (file)
--- 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,9 +23,13 @@ module.exports = {
 
   async syncDown(remote, blogDirectory) {
 
-    await internals.exec(`cd ${blogDirectory} && git init`);
-    await internals.exec(`cd ${blogDirectory} && git checkout .`);
+    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`);
   }
-}
+};