diff --git a/scripts/package/README.txt b/scripts/package/README.txt index 085add795..4d41a36be 100644 --- a/scripts/package/README.txt +++ b/scripts/package/README.txt @@ -1,10 +1,18 @@ -Run move-to-aw-modules.sh to copy all modules except aw-tauri to ~/aw-modules/. -aw-tauri (replaces aw-qt) will use this directory to discover new modules. -You can add your own modules and scripts to this directory. The modules should -start with the aw- prefix and should not have an extension (e.g. no .sh). +ActivityWatch (Tauri edition) for Linux -In the aw-tauri folder there are AppImage, RPM, and DEB binaries. Choose the -appropriate one for your Linux distribution. If in doubt, use the AppImage as -it works on most Linux systems. If you use the AppImage, copy it to a permanent -folder like ~/bin or /usr/local/bin, since autostart relies on the AppImage -being in the same location each time. +aw-tauri/aw-tauri.AppImage is self-contained: the window and AFK watcher +(aw-awatcher, works on Wayland and X11), aw-sync and aw-notify (notifications, +enable them from the tray menu) are bundled inside it. +Put it wherever you like (e.g. ~/bin) and run it from there. Once autostart +is on, keep it in that place: autostart starts the AppImage from where it +was. + +To install system-wide instead, use aw-tauri/aw-tauri.deb or +aw-tauri/aw-tauri.rpm. They contain the same bundled modules. + +The other folders here are optional extra modules: aw-watcher-input, and the +classic aw-watcher-window / aw-watcher-afk for X11. To use one, copy its +folder into ~/.local/share/activitywatch/aw-tauri/modules/ (or +$XDG_DATA_HOME/activitywatch/aw-tauri/modules/ if you set XDG_DATA_HOME) and +restart ActivityWatch. Your own modules can go there too: the executable must +start with aw- and have no extension (e.g. no .sh). diff --git a/scripts/package/move-to-aw-modules.sh b/scripts/package/move-to-aw-modules.sh deleted file mode 100755 index f3f79ca39..000000000 --- a/scripts/package/move-to-aw-modules.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Copy all AW modules to ~/aw-modules/ for aw-tauri to discover. -# aw-tauri uses this directory to find and launch AW components. -set -e - -mkdir -p ~/aw-modules/ - -if [[ -n "$XDG_SESSION_TYPE" && "$XDG_SESSION_TYPE" == "wayland" ]]; then - rsync -a . ~/aw-modules/ \ - --exclude=aw-tauri \ - --exclude=aw-server-rust \ - --exclude=awatcher \ - --exclude=move-to-aw-modules.sh \ - --exclude=README.txt - cp ./awatcher/aw-awatcher ~/aw-modules/ - cp ./aw-server-rust/aw-sync ~/aw-modules/ -else - rsync -a . ~/aw-modules/ \ - --exclude=aw-tauri \ - --exclude=awatcher \ - --exclude=aw-server-rust \ - --exclude=move-to-aw-modules.sh \ - --exclude=README.txt - cp ./aw-server-rust/aw-sync ~/aw-modules/ -fi - -echo "Modules copied to ~/aw-modules/" diff --git a/scripts/package/package-all.sh b/scripts/package/package-all.sh index f6a2ca84f..7c4476316 100755 --- a/scripts/package/package-all.sh +++ b/scripts/package/package-all.sh @@ -72,9 +72,12 @@ echo "Tauri build: ${TAURI_BUILD:-false}" echo "========================================" echo -# For Tauri Linux builds, include helper scripts and README +# For Tauri Linux builds, include the README. awatcher is bundled inside the +# AppImage/deb/rpm (staged into aw-tauri's modules/ by the Makefile), so the +# loose copy is left out of the zip. if [[ $platform == "linux" && $TAURI_BUILD == "true" ]]; then - cp scripts/package/README.txt scripts/package/move-to-aw-modules.sh dist/activitywatch/ + cp scripts/package/README.txt dist/activitywatch/ + rm -rf dist/activitywatch/awatcher fi function build_zip() {