Skip to content

Commit

Permalink
fix: vial init
Browse files Browse the repository at this point in the history
  • Loading branch information
darakuneko committed Aug 2, 2023
1 parent 4c3644a commit 222d47e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gpk_fwmaker/server/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ app.post('/build/vial', async (req, res) => {
const kbDir = kb.replace(/\/.*/g, "")
const km = req.body.km.replace(/:.*|flash/g, "")
const commit = "commit" in req.body && req.body.commit.length > 0 ? req.body.commit : "vial"
await cmd.checkoutVial(res, commit)
await cmd.checkoutVial(res, 'vial', commit)
await cmd.cpConfigsToVial(kbDir)
await cmd.buildVialFirmware(res, kb, km)
} catch (e) { streamError(res, e) }
Expand Down
4 changes: 2 additions & 2 deletions gpk_fwmaker/server/src/command.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ const cmd = {
await streamWriteLineQMK(`make git-submodule\n`, res)
await exec(rmKeyboardsL(dirQMK))
},
checkoutVial: async (res, commit) => {
checkoutVial: async (res, repo, commit) => {
await exec(rmKeyboardsL(dirVial))
await streamWriteLineVial(`git fetch origin`, res)
await streamWriteLineVial(`git reset --hard origin/${commit}`, res)
await streamWriteLineVial(`git reset --hard origin/${repo}`, res)
await streamWriteLineVial(`git checkout ${commit}`, res)
await streamWriteLineVial(`make git-submodule\n`, res)
await exec(rmKeyboardsL(dirVial))
Expand Down

0 comments on commit 222d47e

Please sign in to comment.