add --bashrc flag to configure, bump version to 4.2.3

parent c9a441ae
......@@ -42,6 +42,7 @@ export_result ()
\nDOCDIR_LIST=( img img-style )\
\nPCDIR=\"$PCDIR/\"\
\nDIRINFO_ENABLE=\"$DIRINFO_ENABLE\"\
\nBASHFILE=\"$BASHFILE\"\
\nMISSING=($MISSING )" | sed -e 's,\/\/,\/,g' >> $PWD/.configure/results
}
......@@ -130,6 +130,10 @@ end_message () {
echo -e "${YELLOW}Install Documentation:${WHITE}\tNo"
else echo -e "${YELLOW}Install Documentation:${WHITE}\tYes"
fi
if [[ ${BASHFILE} ]]; then
echo -e "${YELLOW}System Bashrc:${WHITE}\t\t${BASHFILE}"
else echo -e "${YELLOW}System Bashrc:${WHITE}\t\tauto detection"
fi
echo ""
tput sgr0
......@@ -137,7 +141,7 @@ end_message () {
help_message () {
echo -e "\n${GREEN}BashStyle-NG ${YELLOW}(configure 4.2.2) ${CYAN}help
echo -e "\n${GREEN}BashStyle-NG ${YELLOW}(configure 4.2.3) ${CYAN}help
\n${WHITE}Options:"
echo -e "${ORANGE}--help${WHITE} *|${GREEN} Display this help message\
\n${ORANGE}--mode=<mode>${WHITE} *|${GREEN} user (do checks) or maintainer (skip checks)\
......@@ -152,6 +156,7 @@ help_message () {
\n${ORANGE}--no-postinstall${WHITE} *|${GREEN} Disable post-installation tasks (for package-maintainers)\
\n${ORANGE}--no-installdocs${WHITE} *|${GREEN} Disable installation of docs (for package-maintainers)\
\n${ORANGE}--quiet${WHITE} *|${GREEN} Only display warnings, failures and results\
\n${ORANGE}--bashrc${WHITE} *|${GREEN} Path to system bashrc (for bashstyle-ng init)\
\n${ORANGE}--dirinfo=<bool>${WHITE} *|${GREEN} true: enable dirinfo wrappers, false: disable (default: disable)" | column -t -s \*
echo
tput sgr0
......
......@@ -18,10 +18,12 @@ remove_cruft () {
add_bsng_init () {
if [[ -e /etc/bash.bashrc ]]; then
BASHFILE=/etc/bash.bashrc
else
BASHFILE=/etc/bashrc
if [[ ! $BASHFILE ]]; then
if [[ -e /etc/bash.bashrc ]]; then
BASHFILE=/etc/bash.bashrc
else
BASHFILE=/etc/bashrc
fi
fi
if [[ $(grep "bashstyle.sh" ${BASHFILE}) == "" ]]; then
......
......@@ -29,6 +29,9 @@ Overview of changes in v8.4 "Mind The Gap"
* add "Report Bugs" button to the about dialog
* updated and completed german translation
* configure 4.2.3: add --bashrc option to pass a specific system
wide bashrc (required for bashstyle-ng init)
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Overview of changes in v8.3 "Tweeka-Time"
......
......@@ -54,6 +54,10 @@ while [[ $xcount -lt $pcount ]]; do
DIRINFO_ENABLE="${1/*=}"
;;
--bashrc=* )
BASHFILE="${1/*=}"
;;
--quiet )
QUIET=true
;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment