Claude/finalize yadm stow setup 5 quk u #147
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| #!/usr/bin/env bash | ||
|
There was a problem hiding this comment. The script file is named |
||
| # shellcheck enable=all shell=bash source-path=SCRIPTDIR | ||
| set -euo pipefail; shopt -s nullglob globstar | ||
| export LC_ALL=C; IFS=$'\n\t' | ||
| has(){ command -v -- "$1" &>/dev/null; } | ||
| info(){ printf '==> %s\n' "$*"; } | ||
| warn(){ printf '==> WARNING: %s\n' "$*"; } | ||
| die(){ printf '==> ERROR: %s\n' "$*" >&2; exit 1; } | ||
|
|
||
| # Get repository directory | ||
| get_repo_dir(){ | ||
| if yadm rev-parse --show-toplevel &>/dev/null; then | ||
| yadm rev-parse --show-toplevel | ||
| elif [[ -d "${HOME}/.local/share/yadm/repo.git" ]]; then | ||
| echo "${HOME}" | ||
| elif git rev-parse --show-toplevel &>/dev/null; then | ||
| git rev-parse --show-toplevel | ||
| else | ||
| die "Cannot determine repository location" | ||
| fi | ||
| } | ||
|
|
||
| usage(){ | ||
| cat <<'EOF' | ||
| deploy-system-configs - Deploy system configs using tuckr or stow | ||
|
|
||
| Usage: deploy-system-configs [OPTIONS] [PACKAGES...] | ||
|
|
||
| Options: | ||
| -h, --help Show this help | ||
| -d, --dir DIR Repository directory (auto-detected if omitted) | ||
| -u, --unlink Unlink/unstow packages instead of linking | ||
|
|
||
| Packages: | ||
| etc Deploy /etc configs | ||
| usr Deploy /usr configs | ||
| (default: etc usr) | ||
|
|
||
| This script automatically uses tuckr if available, otherwise falls back to stow. | ||
|
|
||
| Examples: | ||
| sudo deploy-system-configs # Deploy both etc and usr | ||
| sudo deploy-system-configs etc # Deploy only etc | ||
| sudo deploy-system-configs --unlink # Unlink all packages | ||
| EOF | ||
| } | ||
|
|
||
| REPO_DIR="" | ||
| UNLINK=false | ||
| PACKAGES=() | ||
|
|
||
| while [[ $# -gt 0 ]]; do | ||
| case "$1" in | ||
| -h|--help) usage; exit 0 ;; | ||
| -d|--dir) | ||
|
There was a problem hiding this comment. The argument handling logic has been changed in a way that doesn't match the original intention shown in the diff context. The original version (lines 55-57) checked if the argument after The new implementation on line 55 uses |
||
| if [[ -z ${2:-} ]]; then die "Option '$1' requires an argument."; fi | ||
| REPO_DIR="$2"; shift | ||
| ;; | ||
| -u|--unlink) UNLINK=true ;; | ||
| -*) die "Unknown option: $1" ;; | ||
| *) PACKAGES+=("$1") ;; | ||
| esac | ||
| shift | ||
| done | ||
Ven0m0 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| # Auto-detect repo dir if not provided | ||
| [[ -z $REPO_DIR ]] && REPO_DIR="$(get_repo_dir)" | ||
| [[ -d $REPO_DIR ]] || die "Repository not found: $REPO_DIR" | ||
|
|
||
| # Default to etc and usr if no packages specified | ||
| ((${#PACKAGES[@]} == 0)) && PACKAGES=(etc usr) | ||
|
|
||
| # Check if running as root | ||
| [[ $EUID -eq 0 ]] || die "This script must be run as root (use sudo)" | ||
|
|
||
| # Deploy using tuckr or stow | ||
|
There was a problem hiding this comment. The Move this declaration inside the conditional block as a regular variable assignment, or refactor into a function. |
||
| if has tuckr; then | ||
| info "Using tuckr for deployment" | ||
| local hooks_file="${REPO_DIR}/hooks.toml" | ||
|
There was a problem hiding this comment. The |
||
| for pkg in "${PACKAGES[@]}"; do | ||
| local src="${REPO_DIR}/${pkg}" | ||
| [[ -d $src ]] || { warn "Directory not found: $src"; continue; } | ||
|
|
||
| if [[ $UNLINK == true ]]; then | ||
| info "Unlinking ${pkg}/" | ||
| tuckr unlink -d "$REPO_DIR" -t / "$pkg" || warn "Failed to unlink $pkg" | ||
| else | ||
| info "Linking ${pkg}/ → / (tuckr)" | ||
| local cmd=(tuckr link -d "$REPO_DIR" -t / "$pkg") | ||
|
Comment on lines
+81
to
+89
There was a problem hiding this comment. The |
||
| [[ -f $hooks_file ]] && cmd+=(-H "$hooks_file") | ||
| "${cmd[@]}" || warn "Failed to link $pkg" | ||
|
Comment on lines
+79
to
+91
There was a problem hiding this comment. The |
||
| fi | ||
| done | ||
| elif has stow; then | ||
|
Comment on lines
+78
to
+94
There was a problem hiding this comment. The Remove the |
||
| info "Using stow for deployment (tuckr not available)" | ||
| for pkg in "${PACKAGES[@]}"; do | ||
| local src="${REPO_DIR}/${pkg}" | ||
|
There was a problem hiding this comment. The
Owner
Author
There was a problem hiding this comment. @copilot open a new pull request to apply changes based on this feedback |
||
| [[ -d $src ]] || { warn "Directory not found: $src"; continue; } | ||
|
|
||
| if [[ $UNLINK == true ]]; then | ||
| info "Unstowing ${pkg}/" | ||
| (cd "$REPO_DIR" && stow -t / -d . -D "$pkg") || warn "Failed to unstow $pkg" | ||
| else | ||
| info "Stowing ${pkg}/ → / (stow)" | ||
| (cd "$REPO_DIR" && stow -t / -d . "$pkg") || warn "Failed to stow $pkg" | ||
| fi | ||
| done | ||
| else | ||
| die "Neither tuckr nor stow is installed. Install one of them: | ||
| Arch: paru -S tuckr OR paru -S stow | ||
| Debian: apt install stow" | ||
| fi | ||
|
Comment on lines
+77
to
+112
Contributor
There was a problem hiding this comment. The script will fail at runtime because |
||
|
|
||
| info "Deployment complete" | ||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -8,8 +8,8 @@ clean, hierarchical folder structure. | |||||
| ``` | ||||||
| dotfiles/ | ||||||
| ├── Home/ # User-level dotfiles (~/.*) [Managed by yadm] | ||||||
| ├── etc/ # System configs (/etc/*) [Managed by tuckr/stow] | ||||||
| ├── usr/ # System configs (/usr/*) [Managed by tuckr/stow] | ||||||
| ├── .yadm/ # YADM configuration | ||||||
| │ ├── bootstrap # Main bootstrap script | ||||||
| │ └── config # Repository-wide yadm config | ||||||
|
|
@@ -20,9 +20,10 @@ dotfiles/ | |||||
|
|
||||||
| - **Separation of concerns**: User configs vs. system configs | ||||||
| - **Easy to understand**: Mirrors Linux filesystem structure | ||||||
| - **Flexible deployment**: yadm for user files, tuckr/stow for system files | ||||||
| - **Git-friendly**: Clean repository with minimal clutter | ||||||
| - **Portable**: Works across different systems | ||||||
| - **Fallback support**: Automatically uses stow if tuckr is unavailable | ||||||
|
|
||||||
| --- | ||||||
|
|
||||||
|
|
@@ -169,7 +170,7 @@ yadm push | |||||
|
|
||||||
| ### Update System Configs (etc/, usr/) | ||||||
|
|
||||||
| System configs are managed separately with **tuckr** (or **stow** as fallback): | ||||||
|
|
||||||
| ```bash | ||||||
| # Navigate to repository | ||||||
|
|
@@ -184,8 +185,14 @@ git commit -m "Update pacman configuration" | |||||
| git push | ||||||
|
|
||||||
| # Re-link system configs (creates symlinks) | ||||||
| # Option 1: Using tuckr (preferred) | ||||||
| sudo tuckr link -d $(yadm rev-parse --show-toplevel) -t / etc usr | ||||||
|
|
||||||
| # Option 2: Using stow (fallback) | ||||||
| cd $(yadm rev-parse --show-toplevel) && sudo stow -t / etc usr | ||||||
|
There was a problem hiding this comment. Inconsistent package list specification. The
Suggested change
|
||||||
|
|
||||||
| # Option 3: Using helper script (auto-detects tuckr/stow) | ||||||
| sudo deploy-system-configs | ||||||
| ``` | ||||||
|
|
||||||
| ### Check Repository Status | ||||||
|
|
@@ -256,15 +263,25 @@ Unlike traditional yadm setups where dotfiles are at the repository root, this r | |||||
|
|
||||||
| The `.yadm/bootstrap` script handles this deployment automatically using rsync. | ||||||
|
|
||||||
| ### System Configs with Tuckr or Stow | ||||||
|
There was a problem hiding this comment. Inconsistent capitalization of tool name. The heading uses "Tuckr" with capital T, but throughout the rest of the documentation, the tool name is consistently lowercase "tuckr". The heading should be "System Configs with tuckr or stow" for consistency.
Suggested change
|
||||||
|
|
||||||
| System-level configs (`/etc`, `/usr`) require root permissions and are managed with **tuckr** or **stow**: | ||||||
|
|
||||||
| ```bash | ||||||
| # Using tuckr (preferred - supports hooks) | ||||||
| sudo tuckr link -d /path/to/repo -t / etc | ||||||
| # Creates: /etc/pacman.conf → /path/to/repo/etc/pacman.conf | ||||||
|
|
||||||
| # Using stow (fallback - widely available) | ||||||
| cd /path/to/repo && sudo stow -t / etc | ||||||
|
There was a problem hiding this comment. The stow command is missing the
Suggested change
|
||||||
| # Creates: /etc/pacman.conf → /path/to/repo/etc/pacman.conf | ||||||
|
|
||||||
| # Using helper script (auto-detects best tool) | ||||||
| sudo deploy-system-configs etc usr | ||||||
| ``` | ||||||
|
|
||||||
| The bootstrap script automatically detects which tool is available and uses it accordingly. | ||||||
|
|
||||||
| --- | ||||||
|
|
||||||
| ## 🔧 Advanced Usage | ||||||
|
|
@@ -366,13 +383,24 @@ echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.bashrc | |||||
| ### System configs not applying | ||||||
|
|
||||||
| ```bash | ||||||
| # Option 1: Install tuckr (preferred) | ||||||
| paru -S tuckr # Arch/AUR | ||||||
|
|
||||||
| # Option 2: Install stow (fallback, widely available) | ||||||
| paru -S stow # Arch | ||||||
| sudo apt install stow # Debian/Ubuntu | ||||||
|
|
||||||
| # Re-link system configs with sudo | ||||||
| cd $(yadm rev-parse --show-toplevel) | ||||||
|
|
||||||
| # Using tuckr: | ||||||
| sudo tuckr link -d "$PWD" -t / etc usr | ||||||
|
|
||||||
| # OR using stow: | ||||||
| sudo stow -t / etc usr | ||||||
|
There was a problem hiding this comment. The stow command is missing the
Suggested change
|
||||||
|
|
||||||
| # OR using helper script (auto-detects): | ||||||
| sudo deploy-system-configs | ||||||
| ``` | ||||||
|
|
||||||
| --- | ||||||
|
|
||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,15 +48,19 @@ main(){ | |
| install_packages(){ | ||
| info "Installing packages..." | ||
| local paru_opts=(--needed --noconfirm --skipreview --sudoloop --batchinstall --combinedupgrade) | ||
| local pkgs=(git gitoxide aria2 curl zsh fd sd ripgrep bat jq zoxide starship fzf yadm konsave) | ||
| if ! has paru; then | ||
| die "paru not found." | ||
| fi | ||
| if [[ $DRY_RUN == true ]]; then | ||
| info "[DRY-RUN] Would install: ${pkgs[*]} tuckr (or stow)" | ||
| return 0 | ||
| fi | ||
| # Try installing with tuckr first | ||
| if ! paru -Syuq "${paru_opts[@]}" "${pkgs[@]}" tuckr; then | ||
| warn "tuckr install failed, using stow as fallback" | ||
| paru -Syuq "${paru_opts[@]}" "${pkgs[@]}" stow || die "Failed to install packages" | ||
| fi | ||
| } | ||
| setup_dotfiles(){ | ||
| if ! has yadm; then | ||
|
|
@@ -83,23 +87,39 @@ deploy_home(){ | |
| fi | ||
| } | ||
| link_system_configs(){ | ||
| local pkg | ||
| if has tuckr; then | ||
| info "Using tuckr for system config deployment" | ||
| local hooks_file="${WORKTREE}/hooks.toml" | ||
| for pkg in etc usr; do | ||
| local src="${WORKTREE}/${pkg}" | ||
| [[ -d $src ]] || { warn "Directory not found: $src"; continue; } | ||
| info "Linking ${pkg}/ → / (tuckr)" | ||
| local cmd=(sudo tuckr link -d "$WORKTREE" -t / "$pkg") | ||
| [[ -f $hooks_file ]] && cmd+=(-H "$hooks_file") | ||
| "${cmd[@]}" || warn "Failed to link ${pkg}" | ||
| done | ||
| elif has stow; then | ||
| info "tuckr not found, using stow as fallback" | ||
| for pkg in etc usr; do | ||
| local src="${WORKTREE}/${pkg}" | ||
| [[ -d $src ]] || { warn "Directory not found: $src"; continue; } | ||
| info "Linking ${pkg}/ → / (stow)" | ||
| (cd "$WORKTREE" && sudo stow -t / -d . "$pkg") || warn "Failed to stow ${pkg}" | ||
|
There was a problem hiding this comment. The stow command uses different syntax in different places. Here it uses |
||
| done | ||
| else | ||
| warn "Neither tuckr nor stow found; skipping etc/usr deploy" | ||
| warn "Install with: paru -S tuckr OR paru -S stow" | ||
| return 0 | ||
| fi | ||
| } | ||
|
Comment on lines
89
to
115
Contributor
There was a problem hiding this comment. Similar to the |
||
| final_steps(){ | ||
| info "Run 'yadm status' to review." | ||
| if has tuckr; then | ||
| info "For system configs: sudo tuckr link -d $WORKTREE -t / etc usr" | ||
| elif has stow; then | ||
| info "For system configs: cd $WORKTREE && sudo stow -t / etc usr" | ||
| fi | ||
| info "Validate /etc/fstab with: sudo systemd-analyze verify /etc/fstab" | ||
| info "Setup complete." | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # This directory is managed by tuckr and deployed to /usr |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The stow command uses different syntax in different places. Here it uses
stow -t / -d . "$pkg"with individual package names, but in YADM.md line 192 and 400 it showssudo stow -t / etc usr(multiple packages at once). For consistency and efficiency, the documentation pattern should be followed:sudo stow -t / -d . etc usrto deploy both packages in a single command.