Merge pull request #10846 from omacom/fix-hermes-desktop-stamp-import
Fix Hermes desktop installation and align menu icons
This commit is contained in:
5 files changed
+47
-2
No files matched your search
@@ -140,7 +140,10 @@ import sys
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.insert(0, sys.argv[1])
|
||||
from hermes_cli.main import _write_desktop_build_stamp
|
||||
if Path(sys.argv[1], "hermes_cli/main_desktop.py").is_file():
|
||||
from hermes_cli.main_desktop import _write_desktop_build_stamp
|
||||
else:
|
||||
from hermes_cli.main import _write_desktop_build_stamp
|
||||
|
||||
_write_desktop_build_stamp(Path(sys.argv[1]), source_mode=False)
|
||||
PY
|
||||
|
||||
@@ -12,7 +12,7 @@ The private-use glyphs in `omarchy.ttf` are:
|
||||
- `U+E907` — Ollama, from <https://simpleicons.org/icons/ollama.svg>
|
||||
- `U+E908` — T3 Code, traced from the app icon in <https://aur.archlinux.org/cgit/aur.git/plain/t3code-icon.png?h=t3code-bin>, since upstream publishes no monochrome SVG
|
||||
- `U+E909` — Ori, from <https://openrouter.ai/brand/v2/openrouter-glyph-dark.svg>, OpenRouter's own mark: Ori ships no separate logo and its product page uses this one
|
||||
- `U+E90A` — Hermes, Font Awesome's staff-snake (CC BY 4.0) from <https://fontawesome.com/icons/staff-snake>, the mark Hermes serves as its favicon: their app icon is a portrait that reads as a smudge at menu size
|
||||
- `U+E90A` — Hermes, traced from the [official desktop app portrait](https://raw.githubusercontent.com/NousResearch/hermes-agent/2237be355906fbe6065ce1815711eee52b2d646e/apps/desktop/assets/icon.png), the same artwork shipped by `hermes-desktop`. The monochrome trace is kept in [hermes.svg](hermes.svg).
|
||||
- `U+E90B` — Perplexity, from <https://simpleicons.org/icons/perplexity.svg>
|
||||
- `U+E90C` — OpenClaw, traced from the lobster mascot the openclaw package ships as `dist/control-ui/favicon.svg`, since upstream publishes no monochrome SVG
|
||||
- `U+E90D` — Cursor, from <https://simpleicons.org/icons/cursor.svg>
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
<!--
|
||||
Hermes portrait traced from apps/desktop/assets/icon.png at
|
||||
NousResearch/hermes-agent commit 2237be355906fbe6065ce1815711eee52b2d646e.
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2025 Nous Research
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
-->
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="13.951734482614546 14.280839829258241 100.90844360300241 98.9137748534075"><path d="M34.2 15C26.5 16.6 19.6 22.2 16.3 29.5C14.1 34.6 13 84.1 15 93.5C16.6 101.1 21 106.8 28.4 110.5C34.1 113.3 34.4 113.3 35.4 111.5C36 110.5 38.1 107.8 40.1 105.6C43.4 101.9 46 97.9 46 96.6C46 96.3 44.8 96.7 43.4 97.5C40.2 99.1 36.9 98.2 35.5 95.2C35 94 33.7 92.7 32.7 92.4C30.3 91.6 27 88 27 86.1C27.1 84.8 27.3 84.8 28.1 86.3C30.6 90.6 37.7 90.4 40.1 85.9L41.3 83.7L38.5 85.8C35 88.6 31.6 88.6 29 85.8C26.9 83.5 26.4 78.5 28 76C28.7 74.9 29 75.2 29 77.6C29 83.6 34.2 85.1 36.5 79.7C39.1 73.5 40.3 57.9 38.4 56.1C37.5 55.2 37 55.1 37.4 55.7C38.7 58 36 57.1 33.5 54.4C31.6 52.3 31 50.6 31 47.1C31.1 43.2 33.7 34.5 33.9 37.5C34 38.1 35.7 38.4 37.8 38.3C43.4 37.9 44 37.7 44 37C44 36.7 45.6 36.6 47.5 36.8C49.8 37.1 51 36.8 51 36C51 35.1 51.4 35.1 52.3 35.7C52.9 36.3 55.1 36.8 57.1 36.8C59.2 36.9 61.4 37.1 62.1 37.2C63 37.4 63.5 36.7 63.4 35.4C63.4 33.8 63.9 33.4 65.7 33.8C67 34 68 33.8 68 33.2C68 32.6 68.3 31.4 68.6 30.6C69.4 28.5 65.3 29 64 31C63.5 31.8 62.8 32.1 62.4 31.7C62 31.3 61.2 31.8 60.5 32.7C59.6 33.9 57.4 34.4 51.4 34.5C47.1 34.7 43.4 34.9 43.3 35C42.5 35.8 40.2 35.4 38.4 34.3C37.3 33.6 35.9 33.3 35.4 33.7C34.9 34.1 36 32.8 37.9 30.8C42.1 26.2 51.7 21 56 21C60.5 21 65.6 23.7 69 27.9C72.2 31.7 73 34.1 70.5 32C69.2 30.9 69.1 31 69.6 32.4C69.9 33.3 70.8 34 71.6 34C72.3 34 73.2 35.6 73.6 37.5C73.9 39.4 74.6 41.3 75.1 41.6C75.6 41.9 75.9 41.6 75.8 40.9C75.6 40.2 76.4 39.4 77.4 39.2C78.9 38.9 79.1 39.2 78.6 40.6C78.1 42 78.2 42.2 79 41.4C79.8 40.6 79.8 39.5 79 37.5C77.7 34.1 78.2 33.5 81 35C82.8 36 83.1 35.9 82.5 34.9C81.9 34 82.6 33.8 85.3 34.3C88.5 34.8 89 34.6 89.8 32.2C90.7 29.5 90.8 29.6 93 34.5C94.2 37.2 96.7 46.2 98.6 54.4C100.4 62.5 102.4 70.8 103 72.9C104.5 78.3 104.2 87.7 102.4 91.1C100.1 95.6 101.4 95.7 104.1 91.3C105.8 88.7 106.5 86 106.5 82.7V77.9L107.8 81.1C110.1 86.6 108.6 90.7 101.9 97.2C98.7 100.5 96 102.6 96 102.1C96 101.5 94.6 99.5 92.9 97.5C89.5 93.6 90 92.7 93.7 96.2C95.6 98 96 98.1 95.4 96.7C95.1 95.7 93.4 94.2 91.8 93.4C90.1 92.5 89.1 92.3 89.4 92.9C89.9 93.6 89.1 93.8 87.1 93.4C80.7 92.1 74.1 97.7 71.4 106.8C70.6 109.3 70 111.7 70 112.2C70 112.6 76 113 83.3 113C98 113 102 111.8 107.6 106.2C114.3 99.6 114.5 98.5 114.8 67.1C115.2 29.3 113.9 24.1 101.8 17.5L96.5 14.5L67.5 14.3C51.6 14.2 36.6 14.5 34.2 15ZM80.5 20.7C82.7 21.9 85.4 23.8 86.4 24.9C88.8 27.5 89.4 30.4 87.5 29.6C86.7 29.3 85.8 29.9 85.5 31C84.5 34.3 77.5 33.5 76 29.9C73.8 24.7 67.6 20 62.7 20C59.5 20 58.9 19.7 60 18.9C62.5 17.2 76 18.4 80.5 20.7ZM53 43.8C53 44.5 53.5 46.1 54.1 47.2C56 50.8 50.3 51.9 46.2 48.7C45.3 48 45.1 48.1 45.5 49.2C45.9 50.3 45.3 51 43.6 51.4C40.3 52.2 40.3 53.6 43.5 54.4C46.6 55.2 46.6 56 43.9 59.4C41.1 63 41.7 69.1 45.5 75.6L48.2 80.2L53.6 79.6C58.7 79 58.9 79.1 60.7 82C63.3 86.5 64.4 85.2 65.2 76.4C65.5 72.1 66.3 66.1 66.9 63.1C69.2 51.6 68.5 50 60.9 50C57.5 50 56.8 49.6 55.1 46.2C54 44.2 53.1 43.1 53 43.8ZM59.8 52.6C62 54.1 62 54.3 60.4 56.1C58.2 58.6 57.6 58.5 54.5 55.4C50.4 51.3 54.7 49 59.8 52.6ZM46.7 68.7C47.3 68.3 48.6 68.7 49.6 69.5C51.4 70.8 51.3 70.9 48.5 70.7C45.5 70.5 44 69.4 44 67.5C44 66.9 44.4 67.1 44.9 67.9C45.4 68.6 46.2 69 46.7 68.7ZM57.6 55.6C57.2 56.6 57.5 57 58.2 56.8C59.7 56.3 60.5 54 59.2 54C58.7 54 57.9 54.7 57.6 55.6ZM77.6 53.9C77.3 54.4 78.1 54.7 79.5 54.7C80.9 54.7 81.7 54.4 81.4 53.9C81.1 53.4 80.3 53 79.5 53C78.7 53 77.9 53.4 77.6 53.9ZM42 56.9C42 57.5 42.4 58.2 43 58.5C43.6 58.8 43.7 58.4 43.4 57.6C42.7 55.8 42 55.5 42 56.9ZM72.4 74.4C71.4 77.6 71.5 77.8 73 77C74.2 76.4 74.6 75.3 74.3 73.5C73.6 70.4 73.7 70.3 72.4 74.4ZM98.1 76.8C98 80.3 97.5 84.1 96.9 85.3C95.9 87.4 96 87.4 97.9 85.1C100.1 82.6 100.6 76.3 99 72.5C98.4 71.1 98.1 72.4 98.1 76.8ZM72 80.5C71 81.7 71 82.4 71.8 83.2C73.3 84.7 76.1 82.4 75.3 80.4C74.6 78.6 73.6 78.6 72 80.5ZM62.8 87.9C62 88.9 60.7 89.9 60 90.2C59 90.5 59.1 91.4 60.4 93.8C62.3 97.4 63 97.6 66.8 95.5C72.5 92.4 72.5 92.4 68.9 89.1C64.9 85.5 64.9 85.5 62.8 87.9ZM67 93.2C67 93.6 66.3 93.6 65.3 93.3C64.2 92.9 63.9 93 64.4 93.8C64.8 94.5 64.7 95 64.3 95C63.8 95 62.9 94 62.1 92.9C60.9 90.9 61 90.8 62.8 91.2C64.4 91.6 64.7 91.4 64.3 90.1C64 88.9 64.2 89 65.4 90.4C66.3 91.5 67 92.7 67 93.2ZM42.2 91C41.5 92.1 39.9 93 38.4 93C37 93 36.1 93.4 36.5 94C38.1 96.5 44.8 92.9 43.8 90C43.7 89.5 42.9 89.9 42.2 91ZM74 94C67.7 95.9 61.6 100.3 56.9 106.1C51 113.5 51.1 113 55.8 113C59.2 112.9 59.8 112.5 63.9 106.4C66.3 102.9 68.4 100.1 68.6 100.2C68.7 100.4 68 103.2 66.9 106.4C65.9 109.7 65.2 112.5 65.5 112.8C66.9 114.3 68.9 111.4 70 106.2C70.9 101.9 72.2 99.1 74.5 96.6C78 92.8 77.9 92.7 74 94ZM50.4 104.5C47.8 107.1 47.3 112 49.6 112.7C50.5 113 55 104.6 55 102.6C55 101.2 52.7 102.2 50.4 104.5ZM51.5 109C50.6 110.8 49.6 112 49.4 111.7C49.1 111.5 49.7 109.9 50.7 108.2C53 104.2 53.6 104.9 51.5 109ZM39.5 111C38.5 112.1 38.2 113 38.8 113C39.4 113 40.4 112.1 41 111C41.6 109.9 41.9 109 41.7 109C41.5 109 40.5 109.9 39.5 111Z"/></svg>
|
||||
Binary file not shown.
@@ -357,3 +357,18 @@ OMARCHY_TEST_HOME="$hermes_home/PrOfIlEs/coder/../coder/" run_installer || fail
|
||||
[[ -x $runtime/apps/desktop/release/linux-unpacked/Hermes ]] || fail "profile uses the canonical root runtime"
|
||||
grep -qxF "$hermes_home" "$test_tmp/install-args" || fail "canonical custom home reaches upstream installer"
|
||||
pass "custom profile paths normalize to the shared Hermes home"
|
||||
|
||||
# New releases moved the stamp writer out of main. Keep the earlier cases on
|
||||
# the old layout and exercise a fresh installation with the relocated helper.
|
||||
git -C "$test_tmp/seed" mv hermes_cli/main.py hermes_cli/main_desktop.py
|
||||
printf 'raise AssertionError("legacy module imported after desktop split")\n' >"$test_tmp/seed/hermes_cli/main.py"
|
||||
git -C "$test_tmp/seed" add hermes_cli/main.py
|
||||
git -C "$test_tmp/seed" -c user.name=Test -c user.email=test@example.invalid commit -qm split-desktop
|
||||
release_commit=$(git -C "$test_tmp/seed" rev-parse HEAD)
|
||||
export OMARCHY_TEST_RELEASE_COMMIT="$release_commit"
|
||||
printf '{"branch":"main","commit":"%s"}\n' "$release_commit" >"$test_tmp/package/resources/install-stamp.json"
|
||||
new_home split-desktop
|
||||
run_installer || fail "setup supports the relocated desktop helper" "$(cat "$test_tmp/output")"
|
||||
[[ $(cat "$hermes_home/desktop-build-stamp.json") == 'upstream build stamp' ]] || fail "relocated helper writes the build stamp"
|
||||
grep -qx launch "$test_tmp/events" || fail "setup launches after the relocated helper writes the stamp"
|
||||
pass "new releases use the relocated desktop stamp writer"
|
||||
Reference in new issue
Block a user