fix(auth): scripts/auth/*.sh — правильный SNIPPET path #589
3 changed files with 14 additions and 3 deletions
|
|
@ -8,7 +8,12 @@
|
|||
# - НЕ коммитит изменения — это задача разработчика.
|
||||
set -euo pipefail
|
||||
|
||||
SNIPPET="$(dirname "$(dirname "$(realpath "$0")")")/caddy/users.caddy.snippet"
|
||||
# Скрипт лежит в `<repo>/scripts/auth/`; snippet — в `<repo>/caddy/`.
|
||||
# Нужно 3× `dirname`: $0 (.../scripts/auth/add_user.sh) → .../scripts/auth → .../scripts → .../<repo>.
|
||||
# Bug fix 2026-05-26 — было 2× dirname (см. [[Bug_AddUser_Sh_Snippet_Path_Fixed]]).
|
||||
SCRIPT_DIR="$(cd "$(dirname "$(realpath "$0")")" && pwd)"
|
||||
REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||
SNIPPET="$REPO_ROOT/caddy/users.caddy.snippet"
|
||||
|
||||
usage() {
|
||||
echo "Usage: $0 <username> \"<comment>\"" >&2
|
||||
|
|
|
|||
|
|
@ -3,7 +3,10 @@
|
|||
# Usage: ./scripts/auth/list_users.sh
|
||||
set -euo pipefail
|
||||
|
||||
SNIPPET="$(dirname "$(dirname "$(realpath "$0")")")/caddy/users.caddy.snippet"
|
||||
# 3× dirname от $0 (.../scripts/auth/list_users.sh) → repo root. Bug fix 2026-05-26.
|
||||
SCRIPT_DIR="$(cd "$(dirname "$(realpath "$0")")" && pwd)"
|
||||
REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||
SNIPPET="$REPO_ROOT/caddy/users.caddy.snippet"
|
||||
|
||||
if [[ ! -f "$SNIPPET" ]]; then
|
||||
echo "ERROR: snippet not found at $SNIPPET" >&2
|
||||
|
|
|
|||
|
|
@ -5,7 +5,10 @@
|
|||
# НЕ коммитит изменения — это задача разработчика.
|
||||
set -euo pipefail
|
||||
|
||||
SNIPPET="$(dirname "$(dirname "$(realpath "$0")")")/caddy/users.caddy.snippet"
|
||||
# 3× dirname от $0 (.../scripts/auth/remove_user.sh) → repo root. Bug fix 2026-05-26.
|
||||
SCRIPT_DIR="$(cd "$(dirname "$(realpath "$0")")" && pwd)"
|
||||
REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||
SNIPPET="$REPO_ROOT/caddy/users.caddy.snippet"
|
||||
|
||||
usage() {
|
||||
echo "Usage: $0 <username>" >&2
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue