From 6c75e705e82f85b4bf93d2f13bce6de452c7b9ef Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 7 Aug 2025 14:10:12 +0200 Subject: [PATCH 1/2] Ensure Osaka Theme is checked out To deal with the past bad migration --- migrations/1754566681.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/migrations/1754566681.sh b/migrations/1754566681.sh index 4f872689..23677dc5 100644 --- a/migrations/1754566681.sh +++ b/migrations/1754566681.sh @@ -2,5 +2,6 @@ echo "Make new Osaka Jade theme available as new default" if [[ ! -L ~/.config/omarchy/themes/osaka-jade ]]; then rm -rf ~/.config/omarchy/themes/osaka-jade + git -C ~/.local/share/omarchy co -f themes/osaka-jade ln -nfs ~/.local/share/omarchy/themes/osaka-jade ~/.config/omarchy/themes/osaka-jade fi From c7e5428df9b6ceaaaed99f8500c9a3057d509a0d Mon Sep 17 00:00:00 2001 From: Chris AtLee Date: Fri, 8 Aug 2025 08:35:32 -0400 Subject: [PATCH 2/2] Fix git usage in migration script A user may not have `co` aliased to `checkout` and then will have errors running the migration script. --- migrations/1754566681.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrations/1754566681.sh b/migrations/1754566681.sh index 23677dc5..56d54afc 100644 --- a/migrations/1754566681.sh +++ b/migrations/1754566681.sh @@ -2,6 +2,6 @@ echo "Make new Osaka Jade theme available as new default" if [[ ! -L ~/.config/omarchy/themes/osaka-jade ]]; then rm -rf ~/.config/omarchy/themes/osaka-jade - git -C ~/.local/share/omarchy co -f themes/osaka-jade + git -C ~/.local/share/omarchy checkout -f themes/osaka-jade ln -nfs ~/.local/share/omarchy/themes/osaka-jade ~/.config/omarchy/themes/osaka-jade fi