Skip to content

Commit 99afa79

Browse files
author
Derek
committed
fix: change default --all UI mode from maclike to winlike
1 parent a8b2025 commit 99afa79

2 files changed

Lines changed: 19 additions & 14 deletions

File tree

TODO.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88

99
## Immediate Tasks
1010

11-
None - all tasks completed.
11+
- [ ] **Local host scripts for maclike/winlike swap**
12+
- Bash scripts in `tools/` or similar for quick mode switching
13+
- `switch-maclike.sh` — runs `ui-mode maclike` with DBUS auto-detection
14+
- `switch-winlike.sh` — runs `ui-mode winlike` with DBUS auto-detection
15+
- Handle case where GNOME is not running (save preference for next login)
16+
- Could also be a single script: `desktop-mode [winlike|maclike]`
1217

1318
## Platform Support
1419

install.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# --tags-include TAGS Include specific tags to run (comma-separated)
1717
# --tags-exclude TAGS Exclude specific tags from running (comma-separated)
1818
# --core Install core developer tools (JFrog, Azure, Node.js, etc.)
19-
# --all Install everything (base + core + VM + RDP + maclike)
19+
# --all Install everything (base + core + VM + RDP + winlike)
2020
# --help Show this help message
2121
#
2222
# SUPPORTED PLATFORMS:
@@ -55,7 +55,7 @@ OPTIONS:
5555
--tags-exclude TAGS Exclude specific tags from running (comma-separated)
5656
--branch BRANCH Git branch to use (default: main)
5757
--core Shortcut for: --tags developer,base,core,advanced
58-
--all Shortcut for: --tags developer,base,core,advanced,vm,optimizer,rdp,maclike
58+
--all Shortcut for: --tags developer,base,core,advanced,vm,optimizer,rdp,winlike
5959
--region REGION Apply regional settings (e.g. au, en_AU.UTF-8)
6060
--help Show this help message
6161
@@ -108,8 +108,8 @@ EXAMPLES:
108108
Install everything except wallpaper:
109109
./install.sh --all --tags-exclude wallpaper
110110
111-
Install everything with Windows-style (winlike overrides default maclike):
112-
./install.sh --all --tags winlike
111+
Install everything with macOS-style (maclike overrides default winlike):
112+
./install.sh --all --tags maclike
113113
114114
Install RDP support for remote desktop access:
115115
./install.sh --tags developer,base,rdp
@@ -118,7 +118,7 @@ EXAMPLES:
118118
./install.sh --check
119119
120120
NOTES:
121-
- If both winlike and maclike are included, winlike takes precedence (overrides default)
121+
- If both winlike and maclike are included, maclike takes precedence (overrides default)
122122
- RDP configures GNOME Remote Desktop with default credentials (dfe/dfe)
123123
- ghostty, fastestmirror, and wallpaper are included by default
124124
- Use --tags-exclude to disable default features without specifying all tags
@@ -166,7 +166,7 @@ while [[ $# -gt 0 ]]; do
166166
shift
167167
;;
168168
--all)
169-
ANSIBLE_TAGS="--tags developer,base,core,advanced,vm,optimizer,rdp,maclike"
169+
ANSIBLE_TAGS="--tags developer,base,core,advanced,vm,optimizer,rdp,winlike"
170170
shift
171171
;;
172172
--region)
@@ -184,13 +184,13 @@ while [[ $# -gt 0 ]]; do
184184
esac
185185
done
186186

187-
# Handle winlike/maclike priority: winlike overrides maclike (since maclike is default in --all)
188-
# If both are specified, remove maclike from tags
189-
if [[ "$ANSIBLE_TAGS" == *"winlike"* ]] && [[ "$ANSIBLE_TAGS" == *"maclike"* ]]; then
190-
print_info "Both winlike and maclike specified - using winlike (winlike overrides default maclike)"
191-
ANSIBLE_TAGS="${ANSIBLE_TAGS//,maclike/}"
192-
ANSIBLE_TAGS="${ANSIBLE_TAGS//maclike,/}"
193-
ANSIBLE_TAGS="${ANSIBLE_TAGS//maclike/}"
187+
# Handle winlike/maclike priority: maclike overrides winlike (since winlike is default in --all)
188+
# If both are specified, remove winlike from tags
189+
if [[ "$ANSIBLE_TAGS" == *"maclike"* ]] && [[ "$ANSIBLE_TAGS" == *"winlike"* ]]; then
190+
print_info "Both winlike and maclike specified - using maclike (maclike overrides default winlike)"
191+
ANSIBLE_TAGS="${ANSIBLE_TAGS//,winlike/}"
192+
ANSIBLE_TAGS="${ANSIBLE_TAGS//winlike,/}"
193+
ANSIBLE_TAGS="${ANSIBLE_TAGS//winlike/}"
194194
fi
195195

196196
# Handle --region: resolve short codes to full locale, add tag and extra var

0 commit comments

Comments
 (0)