Added gitCmd init, replaced execSync w/ safer spawnSync, bumped bump.mjs

Author: adamlui

utils/bump/chatbots.mjs

@@ -6,7 +6,7 @@
 // NOTE: Pass <--commit-msg|-m> "msg" to commit w/ msg
 // NOTE: Pass <--no-push|-np> to skip git push
 
-import { execSync, spawnSync } from 'child_process'
+import { spawnSync } from 'child_process'
 import fs from 'fs'
 import path from 'path'
 
@@ -19,15 +19,16 @@ const script = {
         cache: args.some(arg => arg.startsWith('--cache')),
         commitMsg: (() => {
             const idx = args.findIndex(arg => ['--commit-msg', '-m'].includes(arg))
-            return idx != -1 && args[idx +1] ? args[idx +1].replace(/^"|"$/g, '') : null
+            return idx != -1 && args[idx+1] ? args[idx+1].replace(/^"|"$/g, '') : null
         })(),
         noPush: args.some(arg => ['--no-push', '-np'].includes(arg))
     },
-    urls: { bumpmjs: 'https://cdn.jsdelivr.net/gh/adamlui/ai-web-extensions@0f3fc32/utils/bump/lib/bump.min.mjs' }
+    urls: { bumpmjs: 'https://cdn.jsdelivr.net/gh/adamlui/ai-web-extensions@c664f09/utils/bump/lib/bump.min.mjs' }
 }
 script.cache.paths.bumpmjs = path.join(process.cwd(), `${script.cache.paths.root}/bump.min.mjs`)
 script.cache.paths.chatbots = path.join(process.cwd(), `${script.cache.paths.root}/chatbots.json`)
 const { cache: { paths: cachePaths }} = script
+const gitCmd = process.platform == 'win32' ? 'git' : '/usr/bin/git'   // same as your ext script
 
 // Import bump.mjs
 fs.mkdirSync(path.dirname(cachePaths.bumpmjs), { recursive: true })
@@ -59,8 +60,7 @@ if (script.config.cache) {
     log.break()
 }
 
-let filesUpdatedCnt = 0
-const bumpedChatbots = {}
+const bumpedChatbots = {} ; let filesUpdatedCnt = 0
 for (const chatbotFile of chatbotFiles) {
     const chatbotName = path.basename(chatbotFile, '.user.js')
     log.working(`\nProcessing ${chatbotName}...\n`)
@@ -86,15 +86,16 @@ if (filesUpdatedCnt == 0) {
 if (script.config.commitMsg) {
     log.working(`\nCommitting bump${pluralSuffix} to Git...\n`)
     try {
-        execSync('git add ./*.user.js')
-        initKudoSyncBot()
-        spawnSync('git', ['commit', '-n', '-m', script.config.commitMsg], { stdio: 'inherit', encoding: 'utf-8' })
+        spawnSync(gitCmd, ['add', ...Object.keys(bumpedChatbots)], { stdio: 'inherit', encoding: 'utf-8' })
+        spawnSync(gitCmd, [
+            '-c', `user.signingkey=${initKudoSyncBot()}`, 'commit', '-n', '-m', script.config.commitMsg
+        ], { stdio: 'inherit', encoding: 'utf-8' })
         log.break()
         if (!script.config.noPush) {
             log.working('\nPulling latest changes from remote to sync local repository...\n')
-            execSync('git pull')
+            spawnSync(gitCmd, ['pull', '--rebase'], { stdio: 'inherit', encoding: 'utf-8' })
             log.working(`\nPushing bump${pluralSuffix} to Git...\n`)
-            execSync('git push')
+            spawnSync(gitCmd, ['push'], { stdio: 'inherit', encoding: 'utf-8' })
         }
         log.success(`Success! ${filesUpdatedCnt} chatbot${pluralSuffix} updated/committed${
             !script.config.noPush ? '/pushed' : ''} to GitHub`)