mirror of
https://github.com/endeavouros-team/eos-bash-shared.git
synced 2026-06-13 01:34:36 +00:00
[eos-bash-shared] EOS_WELCOME_PACDIFFERS can include options in diff tool strings, see eos-script-lib-yad.conf and eos-pacdiff
This commit is contained in:
+1
-1
@@ -197,7 +197,7 @@ Main()
|
||||
# see /etc/eos-script-lib-yad.conf about EOS_WELCOME_PACDIFFERS
|
||||
|
||||
for differ in "${EOS_WELCOME_PACDIFFERS[@]}" ; do
|
||||
if [ -x /usr/bin/$differ ] ; then
|
||||
if [ -x /usr/bin/${differ%% *} ] ; then
|
||||
PacdiffCmd "$differ"
|
||||
return $?
|
||||
fi
|
||||
|
||||
@@ -80,7 +80,7 @@ EOS_AUR_HELPER_OTHER="" # for example: "paru"
|
||||
## by Welcome).
|
||||
## The array is written in preference order as only one of them is used.
|
||||
#
|
||||
EOS_WELCOME_PACDIFFERS=(meld kdiff3 kompare diffuse diff vim)
|
||||
EOS_WELCOME_PACDIFFERS=(meld kdiff3 kompare diffuse diff "vim -d")
|
||||
|
||||
## EOS_PACDIFF_WARNING specifies whether a warning about the power of eos-pacdiff
|
||||
## will be shown or not when starting it.
|
||||
|
||||
Reference in New Issue
Block a user