Ryan Hughes
a2feffa803
The four dev-tools commands that complete the developer-ergonomics story for the package refactor: - omarchy-dev-link <path>: writes /etc/omarchy.conf so OMARCHY_PATH resolves to <path> in all new shells, the Hyprland session env, and systemd --user. Updates the live session via hyprctl setenv + systemctl --user import-environment, restarts omarchy-shell, and reloads Hyprland so the changes are visible immediately. Affects every tree resolved via $OMARCHY_PATH: bin/, default/, shell/, themes/, applications/, config/. - omarchy-dev-unlink: removes /etc/omarchy.conf and reverses the live session updates back to /usr/share/omarchy. - omarchy-dev-status: reports current dev-link state (configured path, current shell, hyprland session env). - omarchy-dev-pkg-test [pkg] [checkout]: builds and installs a package from the checkout via OMARCHY_SRC + makepkg -si --skipchecksums. Used for changes that land at fixed system paths (/etc/, /usr/lib/, udev rule bodies, plymouth themes, /etc/skel) that dev-link can't shadow. The built package's pkgver is tagged 'dev.<short-sha>[.dirty]' so 'pacman -Q' makes its source obvious. Defaults: package omarchy-settings, checkout ~/Work/omarchy/omarchy-installer, PKGBUILDs read from ~/Work/omarchy/omarchy-pkgs/pkgbuilds/. All four ship via omarchy-dev-tools (existing PKGBUILD wildcard). Verified package build picks them up at /usr/bin/omarchy-dev-*.
67 lines
2.2 KiB
Bash
Executable File
67 lines
2.2 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Build and install an Omarchy package from a local checkout
|
|
# omarchy:group=dev
|
|
# omarchy:args=[package-name] [path-to-checkout]
|
|
# omarchy:examples=omarchy dev pkg-test omarchy-settings | omarchy dev pkg-test omarchy ~/Work/omarchy/omarchy-installer
|
|
|
|
set -euo pipefail
|
|
|
|
if [[ ${1:-} == "-h" || ${1:-} == "--help" ]]; then
|
|
cat <<USAGE
|
|
Usage: omarchy dev pkg-test [package-name] [path-to-checkout]
|
|
|
|
Builds and installs an Omarchy package from a local omarchy-installer
|
|
checkout. Use when changes need to land at fixed system paths (/etc/,
|
|
/usr/lib/systemd/, udev rule bodies, plymouth) that omarchy-dev-link
|
|
can't shadow.
|
|
|
|
Defaults:
|
|
package-name omarchy-settings
|
|
path-to-checkout ~/Work/omarchy/omarchy-installer
|
|
|
|
The pkgver of the built package is tagged 'dev.<short-sha>[.dirty]' so
|
|
'pacman -Q' makes it obvious where the installed version came from.
|
|
|
|
PKGBUILDs are read from \${OMARCHY_PKGBUILDS_DIR:-~/Work/omarchy/omarchy-pkgs/pkgbuilds}/<package-name>/.
|
|
USAGE
|
|
exit 0
|
|
fi
|
|
|
|
PKG="${1:-omarchy-settings}"
|
|
CHECKOUT="${2:-$HOME/Work/omarchy/omarchy-installer}"
|
|
PKGBUILDS_ROOT="${OMARCHY_PKGBUILDS_DIR:-$HOME/Work/omarchy/omarchy-pkgs/pkgbuilds}"
|
|
PKGBUILD_DIR="$PKGBUILDS_ROOT/$PKG"
|
|
|
|
if [[ ! -d "$CHECKOUT" ]]; then
|
|
echo "Error: checkout not found at $CHECKOUT" >&2
|
|
exit 1
|
|
fi
|
|
if [[ ! -f "$PKGBUILD_DIR/PKGBUILD" ]]; then
|
|
echo "Error: PKGBUILD not found at $PKGBUILD_DIR/PKGBUILD" >&2
|
|
echo " Pass a different package name as arg 1, or set OMARCHY_PKGBUILDS_DIR." >&2
|
|
exit 1
|
|
fi
|
|
|
|
build_dir=$(mktemp -d -t omarchy-dev-pkg-test.XXXXXX)
|
|
trap 'rm -rf "$build_dir"' EXIT
|
|
|
|
cp -a "$PKGBUILD_DIR/." "$build_dir/"
|
|
|
|
# Mark the build with a versioned dev pkgver so pacman -Q makes the source obvious.
|
|
short_sha=$(git -C "$CHECKOUT" rev-parse --short HEAD 2>/dev/null || echo "local")
|
|
dirty=""
|
|
if [[ -d "$CHECKOUT/.git" ]] && [[ -n "$(git -C "$CHECKOUT" status --porcelain)" ]]; then
|
|
dirty=".dirty"
|
|
fi
|
|
new_pkgver="dev.${short_sha}${dirty}"
|
|
sed -i "s/^pkgver=.*/pkgver=${new_pkgver}/" "$build_dir/PKGBUILD"
|
|
|
|
echo "Building $PKG ${new_pkgver} from $CHECKOUT"
|
|
echo " build dir: $build_dir"
|
|
echo " PKGBUILD : $PKGBUILD_DIR/PKGBUILD"
|
|
echo
|
|
|
|
cd "$build_dir"
|
|
OMARCHY_SRC="$CHECKOUT" makepkg -si --skipchecksums --noconfirm "${@:3}"
|