From 2c8f190bf1e1981813cb04b75b80d46fa79263f5 Mon Sep 17 00:00:00 2001 From: Christopher Warner Date: Tue, 13 Oct 2026 15:12:17 -0400 Subject: feat: ship video install path for ThinkPad/Intel users Add install-aerial-videos, LocalSend lite video pack builder, Intel VAAPI preference, and software x265/x264 encode fallbacks so a T480 can install clips via zip or Apple fetch without AMD-specific assumptions. Co-authored-by: Cursor --- install.sh | 131 +++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 76 insertions(+), 55 deletions(-) (limited to 'install.sh') diff --git a/install.sh b/install.sh index 85dc8df..35f4fa4 100755 --- a/install.sh +++ b/install.sh @@ -1,13 +1,46 @@ #!/usr/bin/env bash # Install Aerial screensaver user service + helpers. +# +# ./install.sh +# ./install.sh --fetch-videos +# ./install.sh --videos-zip /path/to/aerial-videos-lite.zip set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +# shellcheck source=lib/detect-vaapi.sh +source "$ROOT/lib/detect-vaapi.sh" + BIN_DIR="${XDG_BIN_HOME:-$HOME/.local/bin}" UNIT_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/systemd/user" CFG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/aerial-screensaver" +SHARE="$HOME/.local/share/aerial-screensaver" VIDEO_DIR="${VIDEO_DIR:-$HOME/Videos/Screensavers/Aerial}" +FETCH_VIDEOS=0 +VIDEOS_ZIP="" + +usage() { + cat <&2; exit 1; } + shift 2 + ;; + -h|--help) usage; exit 0 ;; + *) echo "Unknown option: $1" >&2; usage >&2; exit 1 ;; + esac +done + need() { if ! command -v "$1" >/dev/null 2>&1; then echo "Missing dependency: $1" >&2 @@ -19,71 +52,49 @@ MISSING=0 need python3 need mpv need systemctl -# PyGObject (gi) is required if ! python3 -c 'from gi.repository import Gio, GLib' 2>/dev/null; then echo "Missing dependency: PyGObject (python3-gobject / python3-gi)" >&2 MISSING=1 fi +if [[ "$FETCH_VIDEOS" -eq 1 ]]; then + need curl + need aria2c + need ffmpeg +fi +if [[ -n "$VIDEOS_ZIP" ]]; then + need unzip +fi if [[ "$MISSING" -ne 0 ]]; then - echo "Install the packages above, then re-run ./install.sh" >&2 + cat >&2 </dev/null || true)" - score=1 - [[ "$cls" == 0x038* ]] && score=0 - [[ "$cls" == 0x030* ]] && score=2 - if [[ "$score" -lt "$best_score" ]]; then - best="$p" - best_score="$score" - fi - done - fi - if [[ -n "$best" ]]; then - printf '%s -' "$best" - return 0 - fi - for p in /dev/dri/renderD*; do - [[ -e "$p" ]] || continue - printf '%s -' "$p" - return 0 - done - return 1 -} - VAAPI="$(detect_vaapi || true)" -mkdir -p "$BIN_DIR" "$UNIT_DIR" "$CFG_DIR" "$VIDEO_DIR" +mkdir -p "$BIN_DIR" "$UNIT_DIR" "$CFG_DIR" "$VIDEO_DIR" "$SHARE/bin" "$SHARE/lib" -install -m 0755 "$ROOT/aerial_screensaver.py" "$BIN_DIR/aerial-screensaver" -install -m 0755 "$ROOT/bin/encode-aerial-lite" "$BIN_DIR/encode-aerial-lite" -install -m 0755 "$ROOT/bin/fetch-aerial-recent" "$BIN_DIR/fetch-aerial-recent" +install -m 0755 "$ROOT/aerial_screensaver.py" "$SHARE/aerial_screensaver.py" +install -m 0755 "$ROOT/bin/encode-aerial-lite" "$SHARE/bin/encode-aerial-lite" +install -m 0755 "$ROOT/bin/fetch-aerial-recent" "$SHARE/bin/fetch-aerial-recent" +install -m 0755 "$ROOT/bin/install-aerial-videos" "$SHARE/bin/install-aerial-videos" +install -m 0644 "$ROOT/lib/detect-vaapi.sh" "$SHARE/lib/detect-vaapi.sh" install -m 0644 "$ROOT/aerial-screensaver.service" "$UNIT_DIR/aerial-screensaver.service" +ln -sfn "$SHARE/aerial_screensaver.py" "$BIN_DIR/aerial-screensaver" +ln -sfn "$SHARE/bin/encode-aerial-lite" "$BIN_DIR/encode-aerial-lite" +ln -sfn "$SHARE/bin/fetch-aerial-recent" "$BIN_DIR/fetch-aerial-recent" +ln -sfn "$SHARE/bin/install-aerial-videos" "$BIN_DIR/install-aerial-videos" + if [[ ! -f "$CFG_DIR/config" ]]; then cat > "$CFG_DIR/config" </dev/null | head -1)" ]]; then + echo + echo "No clips in $VIDEO_DIR yet. Either:" + echo " install-aerial-videos --from-zip ~/Downloads/aerial-videos-lite.zip" + echo " install-aerial-videos # download from Apple (slow on T480)" +fi -- cgit v1.2.3