Update deps, fix broken update

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

diff --git a/lib/remotes/git.js b/lib/remotes/git.js
index 11fdab89ddda38da508e6545c2e009ccbb49d1cc..32230aeb2ab5fad4c469a6a4e7b8bb8abfcf7388 100644 (file)
--- a/lib/remotes/git.js
+++ b/lib/remotes/git.js
@@ -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,8 +23,11 @@ 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`);
   }