lekss361/gendesign
1
0
Fork 0
Code Issues 57 Pull requests Projects Releases Packages Wiki Activity Actions

fix(auth): scripts/auth/*.sh — правильный SNIPPET path #589

Merged
Light1YT merged 1 commit from fix/auth-scripts-snippet-path into main 2026-05-26 08:39:24 +00:00
Conversation 0 Commits 1 Files changed 3 +14 -3
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/auth/add_user.sh
View file

@ -8,7 +8,12 @@
# - НЕ коммитит изменения — это задача разработчика. # - НЕ коммитит изменения — это задача разработчика.
set -euo pipefail 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() { usage() {
echo "Usage: $0 <username> \"<comment>\"" >&2 echo "Usage: $0 <username> \"<comment>\"" >&2

5
scripts/auth/list_users.sh
View file

@ -3,7 +3,10 @@
# Usage: ./scripts/auth/list_users.sh # Usage: ./scripts/auth/list_users.sh
set -euo pipefail 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 if [[ ! -f "$SNIPPET" ]]; then
echo "ERROR: snippet not found at $SNIPPET" >&2 echo "ERROR: snippet not found at $SNIPPET" >&2

5
scripts/auth/remove_user.sh
View file

@ -5,7 +5,10 @@
# НЕ коммитит изменения — это задача разработчика. # НЕ коммитит изменения — это задача разработчика.
set -euo pipefail 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() { usage() {
echo "Usage: $0 <username>" >&2 echo "Usage: $0 <username>" >&2