diff --git a/usr/lib/archboot/installer/autoconfiguration.sh b/usr/lib/archboot/installer/autoconfiguration.sh index feb955e1b..141f5107a 100644 --- a/usr/lib/archboot/installer/autoconfiguration.sh +++ b/usr/lib/archboot/installer/autoconfiguration.sh @@ -230,16 +230,16 @@ _auto_nano_syntax() { } _auto_bash(){ - if [[ ! -f ${_DESTDIR}/etc/profile.d/archboot-bash-prompt.sh ]]; then - _dialog --infobox "Enable archboot's bash prompt on installed system..." 3 70 - ! grep -qw 'archboot-bash-prompt.sh' "${_DESTDIR}/etc/bash.bashrc" &&\ - echo ". /etc/profile.d/archboot-bash-prompt.sh" >> "${_DESTDIR}/etc/bash.bashrc" + if [[ ! -f ${_DESTDIR}/etc/profile.d/custom-bash-prompt.sh ]]; then + _dialog --infobox "Enable custom bash prompt on installed system..." 3 70 + ! grep -qw 'custom-bash-prompt.sh' "${_DESTDIR}/etc/bash.bashrc" &&\ + echo ". /etc/profile.d/custom-bash-prompt.sh" >> "${_DESTDIR}/etc/bash.bashrc" cp /etc/profile.d/archboot-bash-prompt.sh "${_DESTDIR}"/etc/profile.d/ sleep 2 fi if [[ ! -f ${_DESTDIR}/etc/profile.d/archboot-bash-aliases.sh ]]; then - _dialog --infobox "Enable archboot's bash aliases on installed system..." 3 70 - cp /etc/profile.d/archboot-bash-aliases.sh "${_DESTDIR}"/etc/profile.d/ + _dialog --infobox "Enable custom bash aliases on installed system..." 3 70 + cp /etc/profile.d/custom-bash-aliases.sh "${_DESTDIR}"/etc/profile.d/ sleep 2 fi } diff --git a/usr/lib/initcpio/install/archboot_base_common b/usr/lib/initcpio/install/archboot_base_common index 1a8a26353..3a4c6373d 100644 --- a/usr/lib/initcpio/install/archboot_base_common +++ b/usr/lib/initcpio/install/archboot_base_common @@ -60,10 +60,10 @@ build () # use color bash prompt # unlock and delete root password, if not set by user! # use color grep and ls output - for i in archboot-bash-prompt.sh archboot-reset-root-password.sh archboot-bash-aliases.sh; do + for i in custom-bash-prompt.sh archboot-reset-root-password.sh custom-bash-aliases.sh; do add_file "/usr/share/archboot/base/etc/profile.d/$i" "/etc/profile.d/$i" done - echo ". /etc/profile.d/archboot-bash-prompt.sh" >> "$BUILDROOT/etc/bash.bashrc" + echo ". /etc/profile.d/custom-bash-prompt.sh" >> "$BUILDROOT/etc/bash.bashrc" ### add kmod related config file(s) add_file "/usr/lib/depmod.d/search.conf" diff --git a/usr/share/archboot/base/etc/profile.d/archboot-bash-aliases.sh b/usr/share/archboot/base/etc/profile.d/custom-bash-aliases.sh similarity index 100% rename from usr/share/archboot/base/etc/profile.d/archboot-bash-aliases.sh rename to usr/share/archboot/base/etc/profile.d/custom-bash-aliases.sh diff --git a/usr/share/archboot/base/etc/profile.d/archboot-bash-prompt.sh b/usr/share/archboot/base/etc/profile.d/custom-bash-prompt.sh similarity index 100% rename from usr/share/archboot/base/etc/profile.d/archboot-bash-prompt.sh rename to usr/share/archboot/base/etc/profile.d/custom-bash-prompt.sh