New Bash Options:

- add GLOBIGNORE: everything to ignore from globbing. Default value: empty.
- add dotglob: include hidden files (with leading dot) by default during pathname expansion
- add extglob: enable extending globbing with regular expression like extensions (see: http://mywiki.wooledge.org/glob#extglob)
- nocaseglob: ignore case during globbing
- add nocasematch: case insensitive matching for 'case' and '[[' commands
- restructure widgets in Advanced and Shopts categories
- update german translation
- fix some logging in advanced-rc
parent 1d6b29cf
......@@ -13,7 +13,7 @@ Overview of changes in v9.1 "Dial T for TNT"
=== User Interface ===
* added missing revert-to-default icons for PWD Length Spinbutton
* show icons again on the "Back" and "Reset Keybindings" buttons
* show icons again on the "Back" button
* major restructuring and updating of widgets in all categories [WIP]
* minor string changes
......@@ -22,6 +22,18 @@ Overview of changes in v9.1 "Dial T for TNT"
* Renamed "Clock Advanced" Prompt to "Equinox" (the name change is handled
internally, the config updated automatically, no user interaction required)
=== Bash Settings ===
* add GLOBIGNORE: everything to ignore from globbing. Default value: empty.
++ if you set it to ".:.." issueing '$ ls .*' will not include '.' and '..'
* add dotglob: include hidden files (with leading dot) by default during
pathname expansion
* add extglob: enable extending globbing with regular expression like
extensions (see: http://mywiki.wooledge.org/glob#extglob)
* add nocaseglob: ignore case during globbing
* add nocasematch: case insensitive matching for 'case' and '[[' commands
=== Keybindings ===
* add 'Revert' column: revert setting to last saved user value
......
ini_version = 15
ini_version = 16
[Style]
use_bashstyle = False
......@@ -67,6 +67,7 @@ dd_noerror = True
restore_directory = False
debug_verbose = False
user_birthday = ""
glob_ignore = ""
[Readline]
use_readlinecfg = False
......@@ -102,6 +103,10 @@ histreedit = True
no_empty_cmd_completion = False
globasciiranges = False
direxpand = False
dotglob = False
extglob = False
nocaseglob = False
nocasematch = False
[Vim]
use_vimcfg = False
......
This diff is collapsed.
This diff is collapsed.
......@@ -9,23 +9,23 @@
# #
#########################################################
dbg_msg $"BashStyle-NG Setting:" $"HISTTIMEFORMAT" "$HISTTIMEFORMAT"
dbg_log export HISTTIMEFORMAT="$(ini_get history_timeformat) "
dbg_msg $"BashStyle-NG Setting:" $"HISTTIMEFORMAT" "$HISTTIMEFORMAT"
dbg_msg $"BashStyle-NG Setting:" $"HISTCONTROL" "$HISTCONTROL"
dbg_log export HISTCONTROL=$(ini_get history_control)
dbg_msg $"BashStyle-NG Setting:" $"HISTCONTROL" "$HISTCONTROL"
dbg_msg $"BashStyle-NG Setting:" $"HISTIGNORE" "$HISTIGNORE"
dbg_log export HISTIGNORE="$(ini_get history_ignore)"
dbg_msg $"BashStyle-NG Setting:" $"HISTIGNORE" "$HISTIGNORE"
dbg_msg $"BashStyle-NG Setting:" $"FIGNORE" "$FIGNORE"
dbg_log export FIGNORE="$(ini_get completion_ignore)"
dbg_msg $"BashStyle-NG Setting:" $"FIGNORE" "$FIGNORE"
dbg_msg $"BashStyle-NG Setting:" $"CDPATH" "$CDPATH"
dbg_log export CDPATH=$(ini_get cdpath)
dbg_msg $"BashStyle-NG Setting:" $"CDPATH" "$CDPATH"
dbg_msg $"BashStyle-NG Setting:" $"FCEDIT" "$FCEDIT"
dbg_log export FCEDIT=$(ini_get fcedit)
dbg_msg $"BashStyle-NG Setting:" $"FCEDIT" "$FCEDIT"
if [[ $(grep -w TMOUT /etc/profile.d/*msec.sh 2>/dev/null) != "" ]]; then
echo -e "\n * /etc/profile.d/msec.sh prevents setting TMOUT!"
......@@ -34,11 +34,11 @@ else
export TMOUT=$(ini_get timeout)
fi
dbg_msg $"BashStyle-NG Setting:" $"HISTSIZE" "$HISTSIZE"
dbg_log export HISTSIZE=$(ini_get history_size)
dbg_msg $"BashStyle-NG Setting:" $"HISTSIZE" "$HISTSIZE"
dbg_msg $"BashStyle-NG Setting:" $"HISTFILESIZE" "$HISTFILESIZE"
dbg_log export HISTFILESIZE=$(ini_get history_size)
dbg_msg $"BashStyle-NG Setting:" $"HISTFILESIZE" "$HISTFILESIZE"
if [[ $(ini_get path) != "" ]]; then
dbg_msg $"BashStyle-NG Setting:" $"PATH" "$PATH"
......@@ -46,7 +46,7 @@ if [[ $(ini_get path) != "" ]]; then
fi
if [[ $(ini_get restore_directory) == True ]]; then
dbg_log trap 'printf %s "$PWD" > ${HOME}/.lastpwd' EXIT
dbg_log trap 'printf %s "${PWD}" > ${HOME}/.lastpwd' EXIT
if [[ -d "$(cat ${HOME}/.lastpwd 2>/dev/null)" ]]; then
dbg_log cd "$(cat ${HOME}/.lastpwd)"
fi
......@@ -74,3 +74,6 @@ dbg_log export USER_BIRTHDAY=$(ini_get user_birthday)
dbg_log export pwdmaxlen=$(ini_get pwdlength)
dbg_log export trunc_symbol=$(ini_get pwdcut)
dbg_log export dirchar=$(ini_get directory_indicator)
dbg_log export GLOBIGNORE=$(ini_get globignore)
dbg_msg $"BashStyle-NG Setting:" $"GLOBIGNORE" "$GLOBIGNORE"
......@@ -58,13 +58,41 @@ else dbg_msg $"BashStyle-NG Setting:" $"no_empty_cmd_completion" $"Off"
dbg_log shopt -u no_empty_cmd_completion
fi
if [[ $HISTCONTROL != erasedups && $(ini_get histappend) == True ]]; then
if [[ ${HISTCONTROL} != erasedups && $(ini_get histappend) == True ]]; then
dbg_msg $"BashStyle-NG Setting:" $"histappend" $"On"
dbg_log shopt -s histappend
else dbg_msg $"BashStyle-NG Setting:" $"histappend" $"Off"
dbg_log shopt -u histappend
fi
if [[ $(ini_get dotglob) == True ]]; then
dbg_msg $"BashStyle-NG Setting:" $"dotglob" $"On"
dbg_log shopt -s dotglob
else dbg_msg $"BashStyle-NG Setting:" $"dotglob" $"Off"
dbg_log shopt -u dotglob
fi
if [[ $(ini_get extglob) == True ]]; then
dbg_msg $"BashStyle-NG Setting:" $"extglob" $"On"
dbg_log shopt -s extglob
else dbg_msg $"BashStyle-NG Setting:" $"extglob" $"Off"
dbg_log shopt -u extglob
fi
if [[ $(ini_get nocaseglob) == True ]]; then
dbg_msg $"BashStyle-NG Setting:" $"nocaseglob" $"On"
dbg_log shopt -s nocaseglob
else dbg_msg $"BashStyle-NG Setting:" $"nocaseglob" $"Off"
dbg_log shopt -u nocaseglob
fi
if [[ $(ini_get nocasematch) == True ]]; then
dbg_msg $"BashStyle-NG Setting:" $"nocasematch" $"On"
dbg_log shopt -s nocasematch
else dbg_msg $"BashStyle-NG Setting:" $"nocasematch" $"Off"
dbg_log shopt -u nocasematch
fi
# Stuff new in Bash 4.0
if [[ ${BASH_VERSINFO[0]} -ge "4" ]]; then
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -136,6 +136,7 @@ class BashStyleNG(object):
WidgetHandler.InitWidget("dd_noerror", "Advanced", "dd_noerror", "bool", None)
WidgetHandler.InitWidget("restore_pwd", "Advanced", "restore_directory", "bool", None)
WidgetHandler.InitWidget("debug_verbose", "Advanced", "debug_verbose", "bool", None)
WidgetHandler.InitWidget("globignore", "Advanced", "glob_ignore", "text", None)
####################### Readline stuff #############################################
WidgetHandler.InitWidget("readline", "Readline", "use_readlinecfg", "bool", None)
......@@ -171,6 +172,10 @@ class BashStyleNG(object):
WidgetHandler.InitWidget("dirspell", "Shopt", "dirspell", "bool", None)
WidgetHandler.InitWidget("direxpand", "Shopt", "direxpand", "bool", None)
WidgetHandler.InitWidget("globasciiranges", "Shopt", "globasciiranges", "bool", None)
WidgetHandler.InitWidget("dotglob", "Shopt", "dotglob", "bool", None)
WidgetHandler.InitWidget("extglob", "Shopt", "extglob", "bool", None)
WidgetHandler.InitWidget("nocaseglob", "Shopt", "nocaseglob", "bool", None)
WidgetHandler.InitWidget("nocasematch", "Shopt", "nocasematch", "bool", None)
######################## GIT Stuff #################################################
WidgetHandler.InitWidget("use_gitcfg", "Git", "use_gitcfg", "bool", None)
......
......@@ -31,7 +31,7 @@ USER_DEFAULTS_SAVE = (os.getenv('HOME') + '/.bs-ng.ini.save')
FACTORY_DEFAULTS = (DATADIR + '/bashstyle-ng/bs-ng.ini')
VENDOR_DEFAULTS = ('/etc/bs-ng_vendor.ini')
app_ini_version = 15
app_ini_version = 16
class Config(object):
def InitConfig(self):
......
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