The_miro
/
Dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(installer): correct plymouth path + remove from optional apps registry 

plymouth is a core component (COMPONENTS checklist), not an optional app.
Moving plymouth.sh to apps/ left the core dispatch pointing at the deleted
path; also incorrectly added it to modules.conf, duplicating it in the
optional apps checklist.

- Fix core dispatch: $MODULES/optional-Modules/plymouth.sh → $APPS/plymouth.sh
- Remove plymouth from modules.conf (plymouth-custom remains as optional app)
- Regenerate all sentinel regions; conflict block now only has plymouth-custom

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
main
Amir Alexander Abdelbaki 2026-06-26 13:38:37 +02:00
parent 8e9c460713
commit 69aacec8fa
4 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/md/modules.md
View File

@ -144,7 +144,6 @@ bash ~/Dotfiles/setup/install-modules.sh
| `timeshift` | system snapshot and backup with autosnap |
| `zfs` | zfs-dkms kernel module |
| `wprs` | Wayland proxy for remote sessions (wprs-git, AUR) |
| `plymouth` | boot splash — bundled skull logo and spinner |
| `plymouth-custom` | boot splash with a user-supplied image |
<!-- END GENERATED MODULES: system -->

3
setup/generate-answerfile.sh
View File

@ -219,7 +219,7 @@ if [[ "$AF_RUN_TUI" == "true" ]]; then
# BEGIN GENERATED MODULES: module-checklist
AF_APPS=$(dialog --backtitle "$BACKTITLE" \
--title " Applications " \
--checklist "Optional applications — installed after base components:" 40 76 80 \
--checklist "Optional applications — installed after base components:" 40 76 79 \
"ollama" "ollama local LLM runner and API server" off \
"llama-cpp" "llama-cpp standalone LLM inference CLI and server" off \
"open-webui" "open-webui browser UI for Ollama and LLM backends" off \
@ -252,7 +252,6 @@ if [[ "$AF_RUN_TUI" == "true" ]]; then
"timeshift" "timeshift system snapshot and backup with autosnap" off \
"zfs" "zfs zfs-dkms kernel module" off \
"wprs" "wprs Wayland proxy for remote sessions (wprs-git, AUR)" off \
"plymouth" "plymouth boot splash — bundled skull logo and spinner" on \
"plymouth-custom" "plymouth-custom boot splash with a user-supplied image" off \
"steam" "steam Steam gaming platform" off \
"vesktop" "vesktop Discord client with Vencord theme" off \

3
setup/modules.conf
View File

@ -49,8 +49,7 @@ localtunnel|system|expose localhost over a public URL|off|
timeshift|system|system snapshot and backup with autosnap|off|
zfs|system|zfs-dkms kernel module|off|
wprs|system|Wayland proxy for remote sessions (wprs-git, AUR)|off|
plymouth|system|boot splash — bundled skull logo and spinner|on|plymouth-custom
plymouth-custom|system|boot splash with a user-supplied image|off|plymouth
plymouth-custom|system|boot splash with a user-supplied image|off|
# ── Gaming ────────────────────────────────────────────────────────────────────
steam|gaming|Steam gaming platform|off|

14
setup/tui-install.sh
View File

@ -195,7 +195,6 @@ count_steps() {
[[ "$a" == *"timeshift"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"zfs"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"wprs"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"plymouth"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"plymouth-custom"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"steam"* ]] && TOTAL=$(( TOTAL + 1 ))
[[ "$a" == *"vesktop"* ]] && TOTAL=$(( TOTAL + 1 ))
@ -480,7 +479,6 @@ else
"timeshift" "timeshift system snapshot and backup with autosnap" off \
"zfs" "zfs zfs-dkms kernel module" off \
"wprs" "wprs Wayland proxy for remote sessions (wprs-git, AUR)" off \
"plymouth" "plymouth boot splash — bundled skull logo and spinner" on \
"plymouth-custom" "plymouth-custom boot splash with a user-supplied image" off \
"steam" "steam Steam gaming platform" off \
"vesktop" "vesktop Discord client with Vencord theme" off \
@ -594,7 +592,6 @@ if ! $ANSWERFILE_MODE; then
[[ "$SELECTED_APPS" == *"timeshift"* ]] && SUMMARY+=" ✦ timeshift\n"
[[ "$SELECTED_APPS" == *"zfs"* ]] && SUMMARY+=" ✦ zfs\n"
[[ "$SELECTED_APPS" == *"wprs"* ]] && SUMMARY+=" ✦ wprs\n"
[[ "$SELECTED_APPS" == *"plymouth"* ]] && SUMMARY+=" ✦ plymouth\n"
[[ "$SELECTED_APPS" == *"plymouth-custom"* ]] && SUMMARY+=" ✦ plymouth-custom\n"
[[ "$SELECTED_APPS" == *"steam"* ]] && SUMMARY+=" ✦ steam\n"
[[ "$SELECTED_APPS" == *"vesktop"* ]] && SUMMARY+=" ✦ vesktop\n"
@ -664,7 +661,7 @@ count_steps "$COMPONENTS" "$DE" "$SELECTED_APPS"
[[ "$COMPONENTS" == *"core"* ]] && run_module "Core Packages" "$MODULES/core-packages.sh"
[[ "$COMPONENTS" == *"svc"* ]] && run_module "Core Services" "$MODULES/core.sh"
[[ "$COMPONENTS" == *"shell"* ]] && run_module "Shell Setup" "$MODULES/shell-setup.sh"
[[ "$COMPONENTS" == *"plymouth"* ]] && run_module "Plymouth" "$MODULES/optional-Modules/plymouth.sh"
[[ "$COMPONENTS" == *"plymouth"* ]] && run_module "Plymouth" "$APPS/plymouth.sh"
# Route the single selected DE value to its corresponding install script.
# "none" is the skip sentinel — no case branch matches it intentionally.
@ -687,14 +684,6 @@ fi
# module script will be caught by run_module()'s error handling rather than
# silently skipped — 'bash "$script"' will exit non-zero if the file is absent.
# BEGIN GENERATED MODULES: module-conflicts
if [[ "$SELECTED_APPS" == *"plymouth"* && "$SELECTED_APPS" == *"plymouth-custom"* ]]; then
warn "plymouth and plymouth-custom are mutually exclusive — skipping plymouth-custom"
SELECTED_APPS="${SELECTED_APPS/plymouth-custom/}"
fi
if [[ "$SELECTED_APPS" == *"plymouth-custom"* && "$SELECTED_APPS" == *"plymouth"* ]]; then
warn "plymouth-custom and plymouth are mutually exclusive — skipping plymouth"
SELECTED_APPS="${SELECTED_APPS/plymouth/}"
fi
# END GENERATED MODULES: module-conflicts
# BEGIN GENERATED MODULES: module-dispatch
[[ "$SELECTED_APPS" == *"ollama"* ]] && run_module "ollama" "$APPS/ollama.sh"
@ -729,7 +718,6 @@ fi
[[ "$SELECTED_APPS" == *"timeshift"* ]] && run_module "timeshift" "$APPS/timeshift.sh"
[[ "$SELECTED_APPS" == *"zfs"* ]] && run_module "zfs" "$APPS/zfs.sh"
[[ "$SELECTED_APPS" == *"wprs"* ]] && run_module "wprs" "$APPS/wprs.sh"
[[ "$SELECTED_APPS" == *"plymouth"* ]] && run_module "plymouth" "$APPS/plymouth.sh"
[[ "$SELECTED_APPS" == *"plymouth-custom"* ]] && run_module "plymouth-custom" "$APPS/plymouth-custom.sh"
[[ "$SELECTED_APPS" == *"steam"* ]] && run_module "steam" "$APPS/steam.sh"
[[ "$SELECTED_APPS" == *"vesktop"* ]] && run_module "vesktop" "$APPS/vesktop.sh"