mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-10 21:27:02 +01:00
Krzysztof kuhy Rudnicki
4f2b0ccdf7
Two levels of pure taxonomy carrying no information, and a 2-directory
cap leaves no room for them. Categories now sit directly under
linux_configuration/: features, fixes, utils, misc, fresh-install,
installers, diagnostics, gaming, boot_recovery, periodic_background, lib,
meta, tests. A script's own lib/ and tests/ are exempt from the cap, so
those stay put.
Depth violations 248 -> 139; roughly 40 of the remainder are inside
digital_wellbeing and hosts, deferred until the guard-lib repoint.
The moves are the easy half. What breaks is every path that counted
levels, and three classes of it had to be found by resolving paths rather
than reading diffs:
- 52 relative `source` lines for lib/common.sh and lib/android.sh. The
correct prefix differs per file: 40 were ../../ and 12 were ../../../,
so a blanket replace would have fixed one set and broken the other.
- REPO_ROOT in 7 fixes/lib/tests harnesses and setup_syncyomi_guard.sh,
each walking up four levels from a directory now two levels shallower.
This caused a real regression -- the fixes suite went red with
"log_warn: command not found" -- caught by running it and comparing
against the pre-move baseline worktree.
- conftest.py's sys.path entries, which took the pytest gate down with
14 collection errors, and the `# shellcheck source=` directives, which
took shellcheck down with SC1091.
16 symlinks in $HOME broke, including the entire i3blocks bar. All
repointed, and cpu_monitor/memory/disk/time/volume were run to confirm
they emit real output rather than merely resolving.
Verified: 1798 tests pass at 100% coverage, 8 of 9 lib/tests suites pass
(the ninth needs the coverage jail, identically at baseline), pre-commit
is clean, and the two untracked secret configs are still ignored after
their gitignore paths changed.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PJrqKERAo5QUeEHWS5Asgp
105 lines
2.4 KiB
Bash
Executable File
105 lines
2.4 KiB
Bash
Executable File
#!/bin/bash
|
|
# Script to set up ActivityWatch on Arch Linux with i3
|
|
# Handles installation, startup, autostart, and i3blocks status
|
|
# Handles sudo privileges automatically
|
|
|
|
set -e # Exit on any error
|
|
|
|
# Source common library for shared functions
|
|
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
|
|
# shellcheck source=../lib/common.sh
|
|
source "$SCRIPT_DIR/../lib/common.sh"
|
|
|
|
# Function to check and request sudo privileges for package installation
|
|
check_sudo() {
|
|
if [[ $EUID -ne 0 ]] && [[ $1 == "install" ]]; then
|
|
echo "Package installation requires sudo privileges."
|
|
echo "Requesting sudo access..."
|
|
exec sudo "$0" "$@"
|
|
fi
|
|
}
|
|
|
|
# Get the actual user (even when running with sudo)
|
|
set_actual_user_vars
|
|
|
|
echo "ActivityWatch Setup for Arch Linux + i3"
|
|
echo "======================================="
|
|
echo "Current Date: $(date)"
|
|
echo "User: $ACTUAL_USER"
|
|
echo "Target user: $ACTUAL_USER"
|
|
echo "User home: $USER_HOME"
|
|
|
|
# Function to check if ActivityWatch is installed
|
|
check_activitywatch_installed() {
|
|
echo ""
|
|
echo "1. Checking ActivityWatch Installation..."
|
|
echo "========================================"
|
|
|
|
# Check if activitywatch-bin is installed via pacman
|
|
if pacman -Qi activitywatch-bin &>/dev/null; then
|
|
echo "✓ activitywatch-bin package is installed"
|
|
return 0
|
|
fi
|
|
|
|
# Check if aw-qt binary exists in common locations
|
|
local common_paths=(
|
|
"/usr/bin/aw-qt"
|
|
"/usr/local/bin/aw-qt"
|
|
"$USER_HOME/.local/bin/aw-qt"
|
|
"$USER_HOME/activitywatch/aw-qt"
|
|
)
|
|
|
|
for path in "${common_paths[@]}"; do
|
|
if [[ -x $path ]]; then
|
|
echo "✓ ActivityWatch found at: $path"
|
|
return 0
|
|
fi
|
|
done
|
|
|
|
echo "✗ ActivityWatch not found"
|
|
return 1
|
|
}
|
|
|
|
# shellcheck source=lib/aw_install.sh
|
|
source "$SCRIPT_DIR/lib/aw_install.sh"
|
|
# shellcheck source=lib/aw_service.sh
|
|
source "$SCRIPT_DIR/lib/aw_service.sh"
|
|
# shellcheck source=lib/aw_autostart.sh
|
|
source "$SCRIPT_DIR/lib/aw_autostart.sh"
|
|
|
|
|
|
# Main execution flow
|
|
main() {
|
|
local need_install=false
|
|
local need_start=false
|
|
|
|
# Check installation
|
|
if ! check_activitywatch_installed; then
|
|
need_install=true
|
|
fi
|
|
|
|
# Install if needed
|
|
if [[ $need_install == true ]]; then
|
|
install_activitywatch
|
|
fi
|
|
|
|
# Check if running
|
|
if ! check_activitywatch_running; then
|
|
need_start=true
|
|
fi
|
|
|
|
# Start if needed
|
|
if [[ $need_start == true ]]; then
|
|
start_activitywatch
|
|
fi
|
|
|
|
# Always set up autostart and i3blocks (in case they're missing)
|
|
setup_autostart
|
|
create_i3blocks_status
|
|
test_setup
|
|
show_instructions
|
|
}
|
|
|
|
# Run main function
|
|
main "$@"
|