From fa6c02d3213dfd4e6da8e78bd3a2e7004555fd01 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 24 Jan 2024 01:08:56 +0000
Subject: [PATCH] fix: make search result card block
---
quartz/cli/handlers.js | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/quartz/cli/handlers.js b/quartz/cli/handlers.js
index 8fd0912..6f8aad1 100644
--- a/quartz/cli/handlers.js
+++ b/quartz/cli/handlers.js
@@ -113,7 +113,10 @@
}
}
- await fs.promises.unlink(path.join(contentFolder, ".gitkeep"))
+ const gitkeepPath = path.join(contentFolder, ".gitkeep")
+ if (fs.existsSync(gitkeepPath)) {
+ await fs.promises.unlink(gitkeepPath)
+ }
if (setupStrategy === "copy" || setupStrategy === "symlink") {
let originalFolder = sourceDirectory
@@ -447,7 +450,7 @@
try {
gitPull(UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH)
} catch {
- console.log(chalk.red("An error occured above while pulling updates."))
+ console.log(chalk.red("An error occurred above while pulling updates."))
await popContentFolder(contentFolder)
return
}
@@ -519,7 +522,7 @@
try {
gitPull(ORIGIN_NAME, QUARTZ_SOURCE_BRANCH)
} catch {
- console.log(chalk.red("An error occured above while pulling updates."))
+ console.log(chalk.red("An error occurred above while pulling updates."))
await popContentFolder(contentFolder)
return
}
@@ -528,7 +531,7 @@
await popContentFolder(contentFolder)
if (argv.push) {
console.log("Pushing your changes")
- const res = spawnSync("git", ["push", "-f", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], {
+ const res = spawnSync("git", ["push", "-uf", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], {
stdio: "inherit",
})
if (res.status !== 0) {
--
Gitblit v1.10.0