Skip to content

Commit

Permalink
Makefile: create "run" directory instead of "tmp" (cumulated fixes fr…
Browse files Browse the repository at this point in the history
…om v0.3)
  • Loading branch information
akinomyoga committed May 20, 2021
1 parent bbc2a90 commit 9bdb37d
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 11 deletions.
4 changes: 2 additions & 2 deletions GNUmakefile
Expand Up @@ -148,12 +148,12 @@ endif
install: \
$(outfiles:$(OUTDIR)/%=$(INSDIR)/%) \
$(outfiles-doc:$(OUTDIR)/doc/%=$(INSDIR_DOC)/%) \
$(INSDIR)/cache.d $(INSDIR)/tmp
$(INSDIR)/cache.d $(INSDIR)/run
$(INSDIR)/%: $(OUTDIR)/%
bash make_command.sh install "$<" "$@"
$(INSDIR_DOC)/%: $(OUTDIR)/doc/%
bash make_command.sh install "$<" "$@"
$(INSDIR)/cache.d $(INSDIR)/tmp:
$(INSDIR)/cache.d $(INSDIR)/run:
mkdir -p $@ && chmod a+rwxt $@
.PHONY: install

Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -8,7 +8,7 @@
<a href="https://github.com/akinomyoga/ble.sh/wiki/Recipes">Recipes</a> ]
</p>

*Bash Line Editor* (`ble.sh`) is a command line editor written in pure Bash scripts which replaces the default GNU Readline.
*Bash Line Editor* (`ble.sh`) is a command line editor written in pure Bash which replaces the default GNU Readline.

Current devel version is 0.4.
This script supports Bash 3.0 or higher although we recommend to use `ble.sh` with Bash 4.0 or higher.
Expand All @@ -17,7 +17,7 @@ This script is provided under the [**BSD License**](LICENSE.md) (3-clause BSD li

Disclaimer: The core part of the line editor is written in **pure Bash**, but
`ble.sh` relies on POSIX `stty` to set up TTY states before and after the execution of user commands.
It also use other POSIX utilities for acceleration
It also uses other POSIX utilities for acceleration
in some part of initialization and cleanup code,
processing of large data in completions, paste of large data, etc.

Expand Down
10 changes: 9 additions & 1 deletion blerc
Expand Up @@ -611,7 +611,7 @@


##-----------------------------------------------------------------------------
## Key bindings
## Keybindings


## The default mapping of <SP> is magic-space which performs history and
Expand All @@ -627,13 +627,21 @@
#ble-bind -f up 'history-search-backward'
#ble-bind -f down 'history-search-forward'


## If you want to immediately run the matched command by RET, you can specify
## the option "immediate-accept" to nsearch widgets:

#ble-bind -f up 'history-search-backward immediate-accept'
#ble-bind -f down 'history-search-forward immediate-accept'


## If you want to kill/copy words including the spaces preceding them, you can
## use the following keybindings:

#ble-bind -f C-w 'kill-region-or kill-uword'
#ble-bind -f M-w 'copy-region-or copy-uword'


##-----------------------------------------------------------------------------
## Settings for vim-mode

Expand Down
5 changes: 3 additions & 2 deletions memo/ChangeLog.md
Expand Up @@ -100,8 +100,9 @@
- progcomp: fix non-working `complete -C prog` (reported by Archehandoro) `#D1535` 026432d
- bind: fix a problem that `bind '"seq":"key"'` causes a loop macro `bind -s key key` (reported by thanosz) `#D1536` ea05fc5
- bind: fix errors on readline macros (reported by RakibFiha) `#D1537` c257299
- main: work around sourcing `ble.sh` inside subshells `#D1554` 0000000
- main: work around `. ble.sh --{test,update,clear-cache}` in intereactive sessions `#D1555` 0000000
- main: work around sourcing `ble.sh` inside subshells `#D1554` bbc2a90
- main: work around `. ble.sh --{test,update,clear-cache}` in intereactive sessions `#D1555` bbc2a90
- Makefile: create `run` directory instead of `tmp` 0000000

## Compatibility

Expand Down
20 changes: 18 additions & 2 deletions note.txt
Expand Up @@ -704,7 +704,8 @@ bash_features

2021-02-10 #D1470 どうも bash-4.2 の declare -g にはバグがある。declare -gA
とすると属性は global まで適用されるが、代入された値は関数を抜けると共に消
滅する。
滅する。2021-05-20 追記。declare -gA a=() とすると関数を抜けると共に値が消
滅するが、declare -gA a; a=() とすると特に問題は生じない。

* 連想配列 declare -A は bash-4.0 から

Expand Down Expand Up @@ -1379,10 +1380,25 @@ bash_tips
0.5 ControlPanel/TUI Framework
0.4 progcolor

2021-05-20

* syntax: ${a~} に対応していない

何れ消えると思っていたがどうも未だ消える気配はない様だ。取り敢えず使える環
境ではちゃんと着色した方が良い様に思われる。

後気付いたのだが実は ${a^^} や ${a,,} も bash-4.0 から使えた様だ。tolower,
toupper の実装に使えるのでは。と思って確認した所、既に 4.0 以上ではこれらを
使う様になっていた。

2021-05-19

* sabbrev: 単語でなくても任意の文脈で発動する sabbrev が欲しい。\ 等で前置す
れば特に問題ないのではないか?
れば特に問題ないのではないか? 然し、その為には全ての場合について一致するか
どうか確認する必要がある。

* complete: [TAB] 補完の場合には、ユーザー入力があった時に即座にキャンセルす
るのではなくて timeout があっても良いのかもしれない。

2021-05-17

Expand Down
2 changes: 1 addition & 1 deletion src/canvas.sh
Expand Up @@ -1742,7 +1742,7 @@ function ble/canvas/trace-text {
[[ ! $flag_overflow ]]
}
# Note: suppress LC_COLLATE errors #D1205 #D1262 #1341 #D1440
ble/function#suppress-stderr ble/canvas/trace-text {
ble/function#suppress-stderr ble/canvas/trace-text

#------------------------------------------------------------------------------
# ble/textmap
Expand Down
2 changes: 1 addition & 1 deletion src/util.sh
Expand Up @@ -2557,7 +2557,7 @@ function ble/util/expand-alias {
ret=$1
local type; ble/util/type type "$ret"
if [[ $type == alias ]]; then
local data; ble/util/assign data 'LANG=C alias "$ret"' &>/dev/null
local data; ble/util/assign data 'LC_ALL=C alias "$ret"' &>/dev/null
[[ $data == 'alias '*=* ]] && builtin eval "ret=${data#alias *=}"
fi
}
Expand Down

0 comments on commit 9bdb37d

Please sign in to comment.