fixed bugs #181, #182, #183, remove now unused ascii art

parent 47a6d5f3
......@@ -39,11 +39,11 @@ export_result ()
echo -e "MODE=\"${MODE}\"\
\nPREFIX=\"${PREFIX}\"\
\nDATADIR=\"${DATADIR}/bashstyle-ng/\"\
\nDATADIR_LIST=( ui rc/{,ascii,functions,internal,settings,styles} termcap/{bar,body} vim/{,colors} )\
\nDATADIR_LIST=( ui rc/{,functions,internal,settings,styles} termcap/{bar,body} vim/{,colors} )\
\nPROFILEDIR=\"${PROFILEDIR}/\"\
\nBINDIR=\"${BINDIR}\"\
\nLOCALEDIR=\"${DATADIR}/locale/\"\
\nLOCALEDIR_LIST=( {de,es,it,ru}/LC_MESSAGES/ )\
\nLOCALEDIR_LIST=( de/LC_MESSAGES/ )\
\nICONDIR=\"${DATADIR}/icons/hicolor/32x32/apps/\"\
\nPCDIR=\"${PCDIR}/\"\
\nBASHFILE=\"${BASHFILE}\"\
......
......@@ -11,7 +11,6 @@
DATA_FILES=( ui/*.{py,ui}:${DATADIR}/ui
rc/nx-rc:${DATADIR}/rc
rc/ascii/*:${DATADIR}/rc/ascii
rc/internal/*:${DATADIR}/rc/internal
rc/settings/*:${DATADIR}/rc/settings
rc/styles/*:${DATADIR}/rc/styles
......
......@@ -85,6 +85,15 @@ Overview of changes in v9.0 "Hotride"
enforce configobj encoding to be utf8 to ensure everything works fine
* #180 (nanorc):
enabling syntax highlighting for GNU Nano did not work properly
* #181 (git):
allow git configuration to apply, if Bash configuration is not used
* #182 (birthday greetings):
fixup user birthday greeting message
* #183 (readline):
make Readline configuration properly apply, if Bash configuration is
not used (previously it would be created in the first new Bash session,
but not applied, so it (or changes to it) took until the second new
Bash session after program run to make readline configuration apply)
=== Wizard-Merge ===
......
________
(________(
| |
| Robin |\t\033[01;36mOwner: @OWNER@\033[01;37m
| Hood |\t\033[01;35mCreated: @CREATED@\033[01;37m
|________|\t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
____
| a._|____
| b| ... |
|__| todo |\t\033[01;36mOwner: @OWNER@\033[01;37m
| ... |\t\033[01;35mCreated: @CREATED@\033[01;37m
|______|\t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
___
| |
_| |_
\ / \t\033[01;36mOwner: @OWNER@\033[01;37m
\ / \t\033[01;35mCreated: @CREATED@\033[01;37m
\_/ \t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
______
| __ |
| | | |
| |__| |\t\033[01;36mOwner: @OWNER@\033[01;37m
| + oo |\t\033[01;35mCreated: @CREATED@\033[01;37m
|_//___|\t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
_
_______| |_
/ \
| _ _ _ |\t\033[01;36mOwner: @OWNER@\033[01;37m
| |_|| ||_| |\t\033[01;35mCreated: @CREATED@\033[01;37m
|____|_|____|\t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
______
| ___ |
| | | |
| |___| | \t\033[01;36mOwner: @OWNER@\033[01;37m
| o o ||\t\033[01;35mCreated: @CREATED@\033[01;37m
|_______| \t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
_____
| o | \
| | | \
| O | | / \t\033[01;36mOwner: @OWNER@\033[01;37m
| 000 | / \t\033[01;35mCreated: @CREATED@\033[01;37m
|_____| \t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
___________
| _______ |
| | \O/ | |
| | | | |\t\033[01;36mOwner: @OWNER@\033[01;37m
| |__/_\__| |\t\033[01;35mCreated: @CREATED@\033[01;37m
|___________|\t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
____
| __ |
_||__||_
| |\t\033[01;36mOwner: @OWNER@\033[01;37m
| [][][] |\t\033[01;35mCreated: @CREATED@\033[01;37m
|________|\t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
_______|\
| \
|/|_____ /
/ |/ |\t\033[01;36mOwner: @OWNER@\033[01;37m
\ ________|\t\033[01;35mCreated: @CREATED@\033[01;37m
\| \t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
___________
| |
| |
| |\t\033[01;36mOwner: @OWNER@\033[01;37m
|___________|\t\033[01;35mCreated: @CREATED@\033[01;37m
__|___|__ \t\033[01;31mTags: @TAGS@
\033[01;32m @NOTES@
......@@ -55,6 +55,7 @@ dbg_msg $"BashStyle-NG Logfile:" $BSNG_LOGFILE
if [[ $(ini_get use_readlinecfg) == "True" ]]; then
dbg_msg $"BashStyle-NG Loading:" $"ReadlineCFG"
dbg_log source $BSNG_RC_DIR/settings/readline-rc
dbg_log bind -f ${HOME}/.inputrc
fi
if [[ $(ini_get use_vimcfg) == "True" ]]; then
......@@ -82,6 +83,8 @@ if [[ $(ini_get use_lscolors) == "True" && $(ini_get enable_colors) == "True" ]]
dbg_log source $BSNG_RC_DIR/settings/ls-rc
fi
dbg_log source $BSNG_RC_DIR/settings/git-rc
if [[ $(ini_get use_bashstyle) == "True" ]]; then
if [[ $(lsb_release -is) == Debian ]]; then
......@@ -114,7 +117,6 @@ if [[ $(ini_get use_bashstyle) == "True" ]]; then
dbg_log source $BSNG_RC_DIR/settings/man-rc
fi
dbg_log source $BSNG_RC_DIR/settings/git-rc
dbg_log source $BSNG_RC_DIR/settings/shopt-rc
shopt -s checkwinsize
......@@ -164,21 +166,16 @@ if [[ $(ini_get use_bashstyle) == "True" ]]; then
WelcomeMessage=$(ini_get welcome_message)
if [[ -e $HOME/.bookmarks ]]; then
dbg_msg $"BashStyle-NG Loading:" $"Bookmarks"
dbg_log . $HOME/.bookmarks
else touch $HOME/.bookmarks
fi
bind -f ${HOME}/.inputrc
if [[ $USER_BIRTHDAY == $(date +%m-%d) && ! -e ~/.bday ]]; then
cat $BSNG_RC_DIR/ascii/birthday
cat $BSNG_RC_DIR/internal/birthday
touch ~/.bday
elif [[ $WelcomeMessage != "" ]]; then \
dbg_msg $"BashStyle-NG Setting:" $"Welcome Message"
dbg_log $WelcomeMessage
fi
[[ $USER_BIRTHDAY != $(date +%m-%d) && -e ${HOME}/.bday ]] && rm -f ${HOME}/.bday
fi
if [[ $(ini_get use_readline == True) ]]; then
......
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