mirror of
https://github.com/yusufipk/dikte.git
synced 2026-09-11 10:56:10 +00:00
Can Soykan Yılmaz
44cfb76652
The macOS backends were already here: CoreAudio capture through ffmpeg, pbcopy and CoreGraphics, Carbon hotkeys, the paths under ~/Library. What was missing was everything that installs them, so install.sh hands over to install-mac.sh on Darwin rather than growing a branch per line: the XDG directories, the .desktop files and the shortcut registry mean nothing there, and an application is a bundle rather than a path. The bundle carries a copy of the interpreter, because macOS files the microphone and Accessibility permissions against the process that asks, and a launcher running Homebrew's python3 would have asked as python3 and shared the grant with everything else on that interpreter. It is signed ad-hoc so a reinstall is the same application rather than two more dialogs, and it says so plainly when a brew upgrade has moved the tree it needs. uninstall.sh and update.sh follow it. The tray icon was invisible: QIcon.fromTheme wants a freedesktop icon theme and hands back a null icon without one, which in a menu bar is the whole interface gone. trayicon.py draws the three shapes as template images, so they follow the menu bar into dark mode, and the bundle's icon comes off the same glyph rather than a binary in the repository. Linux keeps its own icons; these are used only where the theme has nothing. paths.py is the fix that was never about a Mac. config.py imports ggml.py, so ggml.py could not ask it where the data goes; each worked it out for itself and only one of them knew about macOS. Settings went to ~/Library while several gigabytes of models went to ~/.local/share, which is not a place a Mac user looks and not a place uninstall.sh --purge would have deleted from. Ctrl+Space is the input-source switch there and Cmd+Space is Spotlight, so the default is Ctrl+Option+Space, and hotkey.default_combo is the one place that difference lives. The first paste asks for Accessibility with kAXTrustedCheckOptionPrompt, which is what creates the row to switch on; asking the other way opens a pane Dikte is not listed in. `dikte shortcut status` asks the running instance, since the combination is held by that process and by nothing else. Local speech to text is the one piece a Mac builds by hand. whisper.cpp publishes no macOS binary and Homebrew's is configured with WHISPER_BUILD_SERVER=OFF, so it installs whisper-cli and not the server Dikte talks to; program_path already takes a whisper-server off the PATH or out of Settings, so the answer is the one a Linux distribution gets, and the README carries the cmake line. CI grows a macOS job on 3.11 and 3.13, the only place the Carbon and CoreGraphics libraries have to be there to be opened. Written and tested on macOS 27.0 arm64. Two things are still unverified on a Mac: the paste end to end, which waits on the Accessibility toggle, and a meeting recording, which needs a loopback driver.
113 lines
4.6 KiB
Bash
Executable File
113 lines
4.6 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Dikte updater: pull, put the launchers back, restart what was running.
|
|
set -euo pipefail
|
|
|
|
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
USER_NAME="$(id -un)"
|
|
|
|
if [[ "$(uname -s)" == "Darwin" ]]; then
|
|
# Apple's python3 is 3.9 and will stay 3.9, so the one on PATH is the wrong
|
|
# question here. install-mac.sh names the interpreter it installed against in
|
|
# the wrapper it wrote, and that is the one this installation runs on.
|
|
# `|| true` because there may be no wrapper to read: pipefail would otherwise
|
|
# make a missing file the end of the script rather than a question answered no.
|
|
PY="$(sed -n 's/^exec "\([^"]*\)".*/\1/p' "$HOME/.local/bin/dikte" 2>/dev/null | head -1 || true)"
|
|
[[ -x "$PY" ]] || PY="$(command -v python3 || true)"
|
|
DEFAULT_SHORTCUT="Ctrl+Option+Space"
|
|
else
|
|
PY="$(command -v python3 || true)"
|
|
DEFAULT_SHORTCUT="Ctrl+Space"
|
|
fi
|
|
|
|
say() { printf ' %s\n' "$1"; }
|
|
ok() { printf ' \033[32m✓\033[0m %s\n' "$1"; }
|
|
warn() { printf ' \033[33m!\033[0m %s\n' "$1"; }
|
|
die() { printf ' \033[31m✗\033[0m %s\n' "$1"; echo; exit 1; }
|
|
|
|
# The combination stored in the settings, which is where Dikte itself reads it
|
|
# from and the one place that is the same on KDE and on GNOME.
|
|
setting() {
|
|
[[ -n "$PY" ]] || return 0
|
|
"$PY" "$DIR/dikte.py" config get "$1" 2>/dev/null || true
|
|
}
|
|
|
|
echo
|
|
echo "Updating Dikte"
|
|
echo "──────────────"
|
|
|
|
cd "$DIR"
|
|
|
|
# 1. Somewhere there is something to pull ----------------------------------
|
|
command -v git >/dev/null || die "git not found; update by downloading the source again"
|
|
git rev-parse --git-dir >/dev/null 2>&1 \
|
|
|| die "$DIR is not a git checkout; update by downloading the source again"
|
|
|
|
before="$(git rev-parse HEAD)"
|
|
|
|
# 2. Is there anything to come? ---------------------------------------------
|
|
# Asked before anything else is complained about: an unfinished afternoon in
|
|
# the working tree is nobody's problem on a day when nothing has been
|
|
# published. Fetching leaves the working tree alone.
|
|
git fetch --quiet || die "Could not reach the remote."
|
|
upstream="$(git rev-parse '@{u}' 2>/dev/null)" \
|
|
|| die "This branch is not tracking a remote one; pull by hand."
|
|
|
|
if [[ "$before" == "$upstream" ]]; then
|
|
echo
|
|
ok "Already up to date ($(git log -1 --format=%s))"
|
|
echo
|
|
exit 0
|
|
fi
|
|
|
|
# 3. Only now, your own edits -----------------------------------------------
|
|
# They would be overwritten by a fast-forward or would block it, and either way
|
|
# that is your call to make, not this script's. Untracked files are counted
|
|
# too: a fast-forward that adds a file of that name stops on them.
|
|
if [[ -n "$(git status --porcelain)" ]]; then
|
|
warn "There is an update waiting, but you have changes of your own here:"
|
|
git --no-pager status --short | sed 's/^/ /'
|
|
say "Commit them, or put them aside with: git stash --include-untracked"
|
|
die "Nothing was updated."
|
|
fi
|
|
|
|
# --ff-only: an update should be somebody else's commits arriving, never a
|
|
# merge this script decided to make on your behalf. The fetch above already
|
|
# brought them, so this touches no network.
|
|
# advice off: git's suggestion is a merge or a rebase, and which of those you
|
|
# want is the sentence below, not a wall of hints.
|
|
if ! merge_log="$(git -c advice.diverging=false merge --ff-only '@{u}' 2>&1)"; then
|
|
printf '%s\n' "$merge_log" | sed 's/^/ /'
|
|
say "Your branch has commits the remote does not. To put them on top of the"
|
|
say "update instead: git pull --rebase"
|
|
die "Could not fast-forward."
|
|
fi
|
|
after="$(git rev-parse HEAD)"
|
|
|
|
echo
|
|
say "What arrived:"
|
|
git --no-pager log --oneline "$before..$after" | sed 's/^/ /'
|
|
echo
|
|
|
|
# 4. Launchers --------------------------------------------------------------
|
|
# An update can add a dependency or move a file, so the installer runs again.
|
|
# It would otherwise register its own defaults over the keys you chose, so it
|
|
# is told what those are. Read before the installer runs, since it is the one
|
|
# writing them.
|
|
shortcut="$(setting shortcut)"
|
|
cancel_shortcut="$(setting cancel_shortcut)"
|
|
# Positional, so a chosen discard key cannot be passed without the other one.
|
|
"$DIR/install.sh" "${shortcut:-$DEFAULT_SHORTCUT}" "${cancel_shortcut:-}"
|
|
|
|
# 5. The running instance ---------------------------------------------------
|
|
# It is still running the code from before the pull.
|
|
if pgrep -u "$USER_NAME" -f 'dikte\.py' >/dev/null 2>&1; then
|
|
if [[ -n "$PY" ]] && "$PY" "$DIR/dikte.py" restart >/dev/null 2>&1; then
|
|
ok "Restarted, so the new version is the one running"
|
|
else
|
|
warn "Could not restart it; use the tray menu → Restart"
|
|
fi
|
|
else
|
|
say "Dikte was not running. Start it with: dikte"
|
|
fi
|
|
echo
|