From 416dc0b85cabfbb1dced0262b11256fa258f5ee9 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Sat, 30 Apr 2022 13:13:30 -0700 Subject: [PATCH] fix: add update for local hugo-obsidian on make update --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9beee0f..0d29bda 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,14 @@ help: ## Show all Makefile targets @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' update: ## Update Quartz to the latest version on Github + go install github.com/jackyzha0/hugo-obsidian@latest @git remote show upstream || (echo "remote 'upstream' not present, setting 'upstream'" && git remote add upstream https://github.com/jackyzha0/quartz.git) git fetch upstream git log --oneline --decorate --graph ..upstream/hugo git checkout -p upstream/hugo -- layouts .github Makefile assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data -update-force: ## Forcefully pull all changes and don't ask to patch +update-force: ## Forcefully pull all changes and don't ask to patch + go install github.com/jackyzha0/hugo-obsidian@latest @git remote show upstream || (echo "remote 'upstream' not present, setting 'upstream'" && git remote add upstream https://github.com/jackyzha0/quartz.git) git fetch upstream git checkout upstream/hugo -- layouts .github Makefile assets/js assets/styles/base.scss assets/styles/darkmode.scss config.toml data