This commit is contained in:
2026-01-24 05:57:54 +00:00
parent 976bfba988
commit 874c7910d5
2 changed files with 26 additions and 8 deletions

View File

@@ -33,9 +33,9 @@ else
LOLCAT="$(command -v lolcat 2>/dev/null || true)" LOLCAT="$(command -v lolcat 2>/dev/null || true)"
fi fi
# If lolcat missing, fallback to cat (no color) HAVE_LOLCAT=0
if [[ -z "${LOLCAT:-}" ]]; then if [[ -n "${LOLCAT:-}" ]]; then
LOLCAT="cat" HAVE_LOLCAT=1
fi fi
# Punchline source: # Punchline source:
@@ -43,16 +43,26 @@ fi
# - fallback: "Hello" # - fallback: "Hello"
PUNCHLINE="Hello" PUNCHLINE="Hello"
if [[ -r /etc/ps1-punchline ]]; then if [[ -r /etc/ps1-punchline ]]; then
PUNCHLINE="$(cat /etc/ps1-punchline 2>/dev/null || echo "Hello")" PUNCHLINE="$(head -n 1 /etc/ps1-punchline 2>/dev/null || echo "Hello")"
PUNCHLINE="${PUNCHLINE%%$'\r'}"
fi fi
# Print banner (only if figlet exists) # Print banner (only if figlet exists)
if [[ -n "${FIGLET:-}" ]]; then if [[ -n "${FIGLET:-}" ]]; then
"$FIGLET" "$(hostname)" -c | "$LOLCAT" if [[ "$HAVE_LOLCAT" -eq 1 ]]; then
"$FIGLET" -f digital "$PUNCHLINE" -c | "$LOLCAT" "$FIGLET" "$(hostname)" -c | "$LOLCAT"
"$FIGLET" -f digital "$PUNCHLINE" -c | "$LOLCAT"
else
"$FIGLET" "$(hostname)" -c
"$FIGLET" -f digital "$PUNCHLINE" -c
fi
fi fi
# Print sysinfo if available (Linux) # Print sysinfo if available (Linux)
if [[ -n "${LANDSCAPE:-}" ]]; then if [[ -n "${LANDSCAPE:-}" ]]; then
"$LANDSCAPE" | "$LOLCAT" if [[ "$HAVE_LOLCAT" -eq 1 ]]; then
"$LANDSCAPE" | "$LOLCAT"
else
"$LANDSCAPE"
fi
fi fi

View File

@@ -29,12 +29,18 @@ chmod 0644 "$DST_BANNER"
# Ensure /etc/bash.bashrc sources both (idempotent) # Ensure /etc/bash.bashrc sources both (idempotent)
tmp="$(mktemp)" tmp="$(mktemp)"
orig_mode="$(stat -c '%a' "$BASH_BASHRC")"
orig_owner="$(stat -c '%u' "$BASH_BASHRC")"
orig_group="$(stat -c '%g' "$BASH_BASHRC")"
awk -v s="$MARKER_START" -v e="$MARKER_END" ' awk -v s="$MARKER_START" -v e="$MARKER_END" '
$0==s {inside=1; next} $0==s {inside=1; next}
$0==e {inside=0; next} $0==e {inside=0; next}
!inside {print} !inside {print}
' "$BASH_BASHRC" > "$tmp" ' "$BASH_BASHRC" > "$tmp"
cat "$tmp" > "$BASH_BASHRC" install -m "$orig_mode" -o "$orig_owner" -g "$orig_group" "$tmp" "$BASH_BASHRC"
if command -v restorecon >/dev/null 2>&1; then
restorecon "$BASH_BASHRC" >/dev/null 2>&1 || true
fi
rm -f "$tmp" rm -f "$tmp"
cat >> "$BASH_BASHRC" <<EOF cat >> "$BASH_BASHRC" <<EOF
@@ -55,6 +61,8 @@ echo " - $DST_PS1"
echo " - $DST_BANNER" echo " - $DST_BANNER"
echo " - sourcet fra $BASH_BASHRC" echo " - sourcet fra $BASH_BASHRC"
echo echo
echo "Åpne et nytt shell for å se endringene."
echo
echo "Disable per bruker:" echo "Disable per bruker:"
echo " export DISABLE_GLOBAL_PS1=1" echo " export DISABLE_GLOBAL_PS1=1"
echo " export DISABLE_GLOBAL_BANNER=1" echo " export DISABLE_GLOBAL_BANNER=1"