From 67e745332eab191adfaabfd7cbb57f5d9a30b855 Mon Sep 17 00:00:00 2001 From: radishzzz Date: Wed, 28 May 2025 22:12:57 +0100 Subject: [PATCH] fix: update scripts --- scripts/new-post.ts | 6 +++--- scripts/update-theme.ts | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/new-post.ts b/scripts/new-post.ts index 2daab0c..29ecfa7 100644 --- a/scripts/new-post.ts +++ b/scripts/new-post.ts @@ -7,9 +7,9 @@ import { themeConfig } from '../src/config' // pnpm new-post first-post // pnpm new-post first-post.md // pnpm new-post first-post.mdx -// pnpm new-post 2025/03/post -// pnpm new-post 2025/03/post.md -// pnpm new-post 2025/03/post.mdx +// pnpm new-post 2025/03/first-post +// pnpm new-post 2025/03/first-post.md +// pnpm new-post 2025/03/first-post.mdx // Process file path const rawPath = process.argv[2] || 'new-post' diff --git a/scripts/update-theme.ts b/scripts/update-theme.ts index 98ea811..cb4312d 100755 --- a/scripts/update-theme.ts +++ b/scripts/update-theme.ts @@ -1,8 +1,6 @@ import { execSync } from 'node:child_process' import process from 'node:process' -// pnpm update-theme - // Check and set up the remote repository try { execSync('git remote get-url upstream', { stdio: 'ignore' }) @@ -16,7 +14,7 @@ try { execSync('git fetch upstream', { stdio: 'inherit' }) const beforeHash = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim() - execSync('git merge upstream/main', { stdio: 'inherit' }) + execSync('git merge upstream/master', { stdio: 'inherit' }) const afterHash = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim() if (beforeHash === afterHash) {