Skip to content

Commit

Permalink
fix(setup): Unexpected errors
Browse files Browse the repository at this point in the history
lporg, mackup, mksei have several misstakes.
  • Loading branch information
5ouma committed Mar 16, 2024
1 parent a0f53a7 commit 519932a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions data/lporg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ apps:
- Screenshot
- Bluetooth File Exchange
- Audio MIDI Setup
- Screen Sharing
- Print Center
widgets:
pages: []
dock_items:
Expand Down Expand Up @@ -161,10 +163,10 @@ dock_items:
sort: 1
settings:
autohide: true
largesize: 33
largesize: 38
magnification: true
minimize-to-application: true
mru-spaces: false
show-recents: false
tilesize: 30
tilesize: 35
desktop: {}
6 changes: 3 additions & 3 deletions setup
Original file line number Diff line number Diff line change
Expand Up @@ -295,16 +295,16 @@ restoreLaunchpad() {
lporg save -c="$TMPDIR/lporg.yml" &>/dev/null
(diff "$data/lporg.yml" "$TMPDIR/lporg.yml" &>/dev/null) && skip
# shellcheck disable=SC2016
gum run 'Running `lporg load`...' -- lporg load -nyc="$data/lporg.yml" >/dev/null
gum run 'Running `lporg load`...' -- lporg load -nyc="$data/lporg.yml" >/dev/null || :
} && run 'restoreLaunchpad' '## 🚀 Restore Launchpad and Dock' true

restoreAppSettings() {
[[ -z "$(mackup -n backup 2>/dev/null)" || ! $? ]] && skip
[[ -z "$(mackup -n backup 2>/dev/null)" && $? ]] && skip
mackup restore
} && run 'restoreAppSettings' '## 💾 Restore application settings' true

restoreAppShortcuts() {
(defaults read com.apple.universalaccess com.apple.custommenu.apps &>/dev/null) && skip
[[ ! "$(defaults read com.apple.universalaccess com.apple.custommenu.apps)" =~ "NSGlobalDomain" && $? ]] && skip
# shellcheck disable=SC2016
gum run 'Running `mksei load`...' -- mksei load "$data/keyboard_shortcuts.json"
} && run 'restoreAppShortcuts' '## ⌨️ Restore App Shortcuts' true
Expand Down

0 comments on commit 519932a

Please sign in to comment.