UGA-Innovation-Factory/athenix
3
1
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

updater to not require sudo prefix for flags

Browse Source
This commit is contained in:
UGA Innovation Factory
2025-12-19 10:51:35 -05:00
parent b2d5b4c01c
commit 60f908baa1
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sw/updater.nix
View File

@@ -43,6 +43,14 @@ with lib;
# Service path for unprivileged (no flags) # Service path for unprivileged (no flags)
UNIT="update-system.service" UNIT="update-system.service"
# Figure out the "real" invoking user, even under sudo.
INVOKER_USER="''${SUDO_USER:-$(id -un)}"
INVOKER_HOME="$(getent passwd "$INVOKER_USER" | cut -d: -f6)"
if [ -z "$INVOKER_HOME" ]; then
# fallback if getent is weird in some containers
INVOKER_HOME="''${HOME:-/home/$INVOKER_USER}"
fi
# Defaults for flagged mode # Defaults for flagged mode
DEFAULT_REMOTE_URL="https://git.factory.uga.edu/UGA-Innovation-Factory/athenix" DEFAULT_REMOTE_URL="https://git.factory.uga.edu/UGA-Innovation-Factory/athenix"
REPO_MODE="default" # default | local | remote REPO_MODE="default" # default | local | remote
@@ -91,7 +99,7 @@ with lib;
case "$1" in case "$1" in
--local-repo) --local-repo)
REPO_MODE="local" REPO_MODE="local"
LOCAL_PATH="''${HOME}/athenix" LOCAL_PATH="$INVOKER_HOME/athenix"
shift shift
;; ;;
--local-repo=*) --local-repo=*)
@@ -134,7 +142,7 @@ with lib;
# Build flake ref # Build flake ref
if [ "$REPO_MODE" = "local" ]; then if [ "$REPO_MODE" = "local" ]; then
[ -n "$LOCAL_PATH" ] || LOCAL_PATH="''${HOME}/athenix" [ -n "$LOCAL_PATH" ] || LOCAL_PATH="$INVOKER_HOME/athenix"
# Clone default repo if missing # Clone default repo if missing
if [ ! -d "$LOCAL_PATH" ]; then if [ ! -d "$LOCAL_PATH" ]; then
@@ -177,7 +185,14 @@ with lib;
impureFlag="--impure" impureFlag="--impure"
fi fi
exec nixos-rebuild switch --refresh --print-build-logs $impureFlag --flake "''${flakeRef}" # If not root, re-exec via sudo to do the actual switch.
# Preserve our computed invoker context so sudo doesn't "helpfully" change it.
if ! is_root; then
exec sudo --preserve-env=HOME,USER,LOGNAME \
nixos-rebuild switch --refresh --print-build-logs $impureFlag --flake "$flakeRef"
else
exec nixos-rebuild switch --refresh --print-build-logs $impureFlag --flake "$flakeRef"
fi
'') '')
]; ];