refactor: replace $PERSON with local $ws in generate_gitconfig
This commit is contained in:
parent
5cf7a35311
commit
1f2d81984b
@ -92,16 +92,17 @@ esac
|
|||||||
# ─────────────────────────────────────────────
|
# ─────────────────────────────────────────────
|
||||||
# Generate per-user gitconfig
|
# Generate per-user gitconfig
|
||||||
generate_gitconfig() {
|
generate_gitconfig() {
|
||||||
|
local ws="$1"
|
||||||
local access="$HOME/access.yml"
|
local access="$HOME/access.yml"
|
||||||
local template="$HOME/gitconfig.template"
|
local template="$HOME/gitconfig.template"
|
||||||
local userdir="$HOME/secrets/$PERSON"
|
local userdir="$HOME/secrets/$ws"
|
||||||
local name email
|
local name email
|
||||||
|
|
||||||
name=$(yq ".\"$ws\".name" "$access" 2>/dev/null || echo)
|
name=$(yq ".\"$ws\".name" "$access" 2>/dev/null || echo)
|
||||||
email=$(yq ".\"$ws\".email" "$access" 2>/dev/null || echo)
|
email=$(yq ".\"$ws\".email" "$access" 2>/dev/null || echo)
|
||||||
|
|
||||||
if [[ -z "$name" || -z "$email" ]]; then
|
if [[ -z "$name" || -z "$email" ]]; then
|
||||||
log ERROR "Missing name/email for '$PERSON' in $access"
|
log ERROR "Missing name/email for '$ws' in $access"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -116,7 +117,7 @@ generate_gitconfig() {
|
|||||||
start_container_if_needed() {
|
start_container_if_needed() {
|
||||||
if ! podman container exists "$WORKSPACE"; then
|
if ! podman container exists "$WORKSPACE"; then
|
||||||
log INFO "Creating container '$WORKSPACE'"
|
log INFO "Creating container '$WORKSPACE'"
|
||||||
generate_gitconfig
|
generate_gitconfig "$PERSON"
|
||||||
podman run -dit \
|
podman run -dit \
|
||||||
--name "$WORKSPACE" \
|
--name "$WORKSPACE" \
|
||||||
--userns=keep-id \
|
--userns=keep-id \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user