Update README.md

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

diff --git a/lib/remotes/git.js b/lib/remotes/git.js
index c894122c345a0e6877528127e85d7396bb16a065..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
 
 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
   canHandle() {
 
     // For the future: actually check if it's a valid git url


@@ -15,7 +15,7 @@ module.exports = {
 
   async syncUp(remote, blogDirectory) {
 
 
   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`);
     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) {
 
 
   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 {}
     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`);
   }
     await internals.exec(`cd ${blogDirectory} && git clean . -f`);
     await internals.exec(`cd ${blogDirectory} && git pull ${remote} main`);
   }

-}
+};