Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(desktop): add Applications shortcut and DMG installer layout (#7707)

Eric Hayes84c84bc10fc9
diff --git a/nix/dmg-layout.py b/nix/dmg-layout.py
new file mode 100644
index 0000000000..491d4a39af
--- /dev/null
+++ b/nix/dmg-layout.py
@@ -0,0 +1,37 @@
+"""Set the installer volume's Finder layout without launching Finder."""
+
+import sys
+from pathlib import Path
+
+from ds_store import DSStore
+
+
+with DSStore.open(str(Path(sys.argv[1]) / ".DS_Store"), "w+") as store:
+ store["."]["vSrn"] = ("long", 1)
+ store["."]["icvl"] = ("type", b"icnv")
+ store["."]["bwsp"] = {
+ "ShowStatusBar": False,
+ "ShowTabView": False,
+ "ShowToolbar": False,
+ "ShowPathbar": False,
+ "ShowSidebar": False,
+ "WindowBounds": "{{200, 200}, {560, 320}}",
+ }
+ store["."]["icvp"] = {
+ "viewOptionsVersion": 1,
+ "backgroundType": 1,
+ "backgroundColorRed": 1.0,
+ "backgroundColorGreen": 1.0,
+ "backgroundColorBlue": 1.0,
+ "arrangeBy": "none",
+ "gridOffsetX": 0.0,
+ "gridOffsetY": 0.0,
+ "gridSpacing": 100.0,
+ "iconSize": 96.0,
+ "textSize": 14.0,
+ "labelOnBottom": True,
+ "showIconPreview": True,
+ "showItemInfo": False,
+ }
+ store["Macro.app"]["Iloc"] = (150, 140)
+ store["Applications"]["Iloc"] = (410, 140)
diff --git a/nix/tauri-desktop.nix b/nix/tauri-desktop.nix
index 27b2d653b5..1563793c97 100644
--- a/nix/tauri-desktop.nix
+++ b/nix/tauri-desktop.nix
@@ -724,6 +724,12 @@
mkdir -p "$out"
dmgPath="$out/Macro-${appVersion}-${system}.dmg"
+ # Package a drag-to-install volume, including Finder's icon layout.
+ dmgRoot=$(mktemp -d "$TMPDIR/macro-dmg.XXXXXX")
+ cp -a "$appPath" "$dmgRoot/Macro.app"
+ ln -s /Applications "$dmgRoot/Applications"
+ ${pkgs.python3.withPackages (ps: [ ps.ds-store ])}/bin/python \
+ ${./dmg-layout.py} "$dmgRoot"
# hdiutil's automatic APFS sizing can run out of space while copying
# the app. Budget logical bytes (including sparse files), then leave
# 25% plus 64 MiB for filesystem metadata and temporary allocations.
@@ -737,7 +743,7 @@
-fs APFS \
-size "$dmgSizeMiB"m \
-volname "Macro" \
- -srcfolder "$appPath" \
+ -srcfolder "$dmgRoot" \
-ov \
-format UDZO \
"$dmgPath"