contrib: move "fzf" and "bash-preexec" to subdir "integration"

README-ja_JP.md

@@ -607,8 +607,8 @@ ble-bind -f C-t my/example1
 # りも先に bash_completion をロードしておく必要があります。
 source /etc/profile.d/bash_completion.sh
 
-ble-import -d contrib/fzf-completion
-ble-import -d contrib/fzf-key-bindings
+ble-import -d integration/fzf-completion
+ble-import -d integration/fzf-key-bindings
 ```
 
 # 3 ヒント

README.md

@@ -580,8 +580,8 @@ Please follow the instructions in the link for the detailed description.
 # load bash_completion earilier than fzf-completion.
 source /etc/profile.d/bash_completion.sh
 
-ble-import -d contrib/fzf-completion
-ble-import -d contrib/fzf-key-bindings
+ble-import -d integration/fzf-completion
+ble-import -d integration/fzf-key-bindings
 ```
 
 # 3 Tips

ble.pp

@@ -1923,7 +1923,7 @@ function ble/base/initialize-session {
 #%x inc.r|@|lib/core-syntax-def|
 #%x inc.r|@|lib/core-complete-def|
 #%x inc.r|@|lib/core-debug-def|
-#%x inc.r|@|contrib/bash-preexec-def|
+#%x inc.r|@|contrib/integration/bash-preexec-def|
 
 bleopt -I
 #------------------------------------------------------------------------------

docs/ChangeLog.md

@@ -542,6 +542,7 @@
 - fzf-key-bindings: fix a problem that `modifyOtherKeys` is not reflected (reported by SuperSandro2000) `#D1908` 486564a
 - add `histdb` `#D1925` 44d9e10
   - histdb: support auto-complete source `histdb-word` `#D1938` xxxxxxx
+- integration: move `fzf` and `bash-preexec` integrations to subdir `#D1939` xxxxxxx
 
 <!---------------------------------------------------------------------------->
 # ble-0.4.0-devel2

lib/core-complete.sh

@@ -3576,7 +3576,7 @@ function ble/complete/progcomp/.compgen {
   if [[ $comp_func ]]; then
     # fzf
     [[ $comp_func == _fzf_* ]] &&
-      ble-import -f contrib/fzf-completion
+      ble-import -f contrib/integration/fzf-completion
 
     # bash_completion
     if ble/is-function _quote_readline_by_ref; then

note.txt

@@ -1925,8 +1925,6 @@ bash_tips
 2023-02-03
 
   * contrib: ble-import で contrib/ は不要なのではないか?
-  * contrib: fzf, bash-preexec などは integration dir に移動する。install 時に
-    symlink を貼る。
 
   * histdb: 同じディレクトリの一番最近の履歴を抽出する。
 
@@ -6889,6 +6887,14 @@ bash_tips
 
 2023-02-05
 
+  * contrib: fzf, bash-preexec などは integration dir に移動する [#D1939]
+
+    install 時に symlink を貼る。
+
+    古いインストール先を上書きする場合を考えたら symlink でなかったら削除するべ
+    きでは。→実際にやってみたら timestamp で比較してちゃんと rule が発火するの
+    で ln -sf で上書きしてしまえばOK。
+
   * histdb: 今までに入力した単語を記録する機能。単語自動補完 [#D1938]
 
     当初は対応する session_id, exec_id と紐づけて管理する事を考えていたが、其処

src/edit.sh

@@ -3662,10 +3662,10 @@ function ble/edit/display-version/check:fzf {
     fi
 
     local integ=
-    ble/util/import/is-loaded contrib/fzf-key-bindings && integ=$label_integration
+    ble/util/import/is-loaded integration/fzf-key-bindings && integ=$label_integration
 
     ble/edit/display-version/add-line "${sgrC}fzf$sgr0 ${sgrF}key-bindings$sgr0, $version$integ"
-    [[ $integ ]] || ble/edit/display-version/add-line "$label_warning: fzf integration \"contrib/fzf-key-bindings\" is not activated."
+    [[ $integ ]] || ble/edit/display-version/add-line "$label_warning: fzf integration \"integration/fzf-key-bindings\" is not activated."
   fi
 
   # fzf-completion
@@ -3678,10 +3678,10 @@ function ble/edit/display-version/check:fzf {
     fi
 
     local integ=
-    ble/util/import/is-loaded contrib/fzf-completion && integ=$label_integration
+    ble/util/import/is-loaded integration/fzf-completion && integ=$label_integration
 
     ble/edit/display-version/add-line "${sgrC}fzf$sgr0 ${sgrF}completion$sgr0, $version$integ"
-    [[ $integ ]] || ble/edit/display-version/add-line "$label_warning: fzf integration \"contrib/fzf-completion\" is not activated."
+    [[ $integ ]] || ble/edit/display-version/add-line "$label_warning: fzf integration \"integration/fzf-completion\" is not activated."
   fi
 }
 function ble/edit/display-version/check:starship {