From e10f6da01140f483162fe33cc77b2255b0683ac7 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 18 Aug 2023 04:08:26 +0000
Subject: [PATCH] format
---
quartz/bootstrap-cli.mjs | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 8efa7b0..0285551 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -112,6 +112,7 @@
}
async function stashContentFolder(contentFolder) {
+ await fs.promises.rm(contentCacheFolder, { force: true, recursive: true })
await fs.promises.cp(contentFolder, contentCacheFolder, {
force: true,
recursive: true,
@@ -150,7 +151,7 @@
message: `Choose how to initialize the content in \`${contentFolder}\``,
options: [
{ value: "new", label: "Empty Quartz" },
- { value: "copy", label: "Replace with an existing folder", hint: "overwrites `content`" },
+ { value: "copy", label: "Copy an existing folder", hint: "overwrites `content`" },
{
value: "symlink",
label: "Symlink an existing folder",
@@ -163,12 +164,10 @@
async function rmContentFolder() {
const contentStat = await fs.promises.lstat(contentFolder)
- if (contentStat) {
- if (contentStat.isSymbolicLink()) {
- await fs.promises.unlink(contentFolder)
- } else {
- await rimraf(contentFolder)
- }
+ if (contentStat.isSymbolicLink()) {
+ await fs.promises.unlink(contentFolder)
+ } else {
+ await rimraf(contentFolder)
}
}
@@ -274,11 +273,32 @@
console.log("Backing up your content")
if (argv.commit) {
+ const contentStat = await fs.promises.lstat(contentFolder)
+ if (contentStat.isSymbolicLink()) {
+ console.log(chalk.yellow("Detected symlink, trying to dereference before committing"))
+
+ // stash symlink file
+ await stashContentFolder(contentFolder)
+
+ // follow symlink and copy content
+ const linkTarg = await fs.promises.readlink(contentFolder)
+ await fs.promises.cp(linkTarg, contentFolder, {
+ force: true,
+ recursive: true,
+ preserveTimestamps: true,
+ })
+ }
+
const currentTimestamp = new Date().toLocaleString("en-US", {
dateStyle: "medium",
timeStyle: "short",
})
spawnSync("git", ["commit", "-am", `Quartz sync: ${currentTimestamp}`], { stdio: "inherit" })
+
+ if (contentStat.isSymbolicLink()) {
+ // put symlink back
+ await popContentFolder()
+ }
}
await stashContentFolder(contentFolder)
--
Gitblit v1.10.0