Remove unnecessary static files

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

diff --git a/lib/remotes/git.js b/lib/remotes/git.js
index d8e0cfd63e4a30e625a80abddc5ce8125a0b730d..75ef43ede2864ca68cd7070107abe9fa972bd42f 100644 (file)
--- a/lib/remotes/git.js
+++ b/lib/remotes/git.js
@@ -1,30 +1,35 @@
-const { exec } = require('child_process');
-const { debuglog, promisify } = require('util');
+import { exec } from 'child_process';
+import { promisify } from 'util';

 
 const internals = {
   // Promisified functions
 
 const internals = {
   // Promisified functions

-  exec: promisify(exec),
-
-  debuglog: debuglog('blog'),
+  exec: promisify(exec)

 };
 
 };
 

-module.exports = {
+export default {

   canHandle() {
   canHandle() {

+

     // For the future: actually check if it's a valid git url
     return true;
   },
 
   async syncUp(remote, blogDirectory) {
     // For the future: actually check if it's a valid git url
     return true;
   },
 
   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`);
   },
 
   async syncDown(remote, blogDirectory) {
     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`);
   },
 
   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`);
   }
     await internals.exec(`cd ${blogDirectory} && git clean . -f`);
     await internals.exec(`cd ${blogDirectory} && git pull ${remote} main`);
   }

-}
+};