Skip to content

Commit 96afdcd

Browse files
krobeluszyv
authored andcommitted
contrib: updates for fish wrapper
- make gitignore and makefile work for all shell wrappers - use $@ instead of repeating target name - add missing fish targets - remove unnecessary quoting (fish does not do word splitting, only line splitting) - fix wrong quoting ("$argv" would join args by spaces into a single arg) - add missing contrib/mc.fish.in; use "function" instead of "alias" since that's more idiomatic for fish. Though "alias mc='source @pkglibexecdir@/mc-wrapper.fish '" would result in pretty much the same function being defined internally. Confirmed it works (but only when I exit mc with F10, not when I type "exit" in its subshell): $ make install $ source /home/johannes/.local/libexec/mc/mc.fish $ type mc mc is a function with definition # Defined in /home/johannes/.local/libexec/mc/mc.fish @ line 1 function mc --description 'Visual shell for Unix-like systems - fish wrapper' source /home/johannes/.local/libexec/mc/mc-wrapper.fish $argv end Signed-off-by: Johannes Altmanninger <aclopte@gmail.com> Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
1 parent 7376bc6 commit 96afdcd

File tree

10 files changed

+51
-32
lines changed

10 files changed

+51
-32
lines changed

contrib/.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
mc-wrapper.csh
2-
mc-wrapper.sh
1+
mc-wrapper.*
2+
!mc-wrapper.*.in
33
mc.csh
44
mc.sh
5+
mc.fish

contrib/Makefile.am

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
11

22
noinst_DATA = README.xterm
33

4-
SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
5-
SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
4+
SCRIPTS_IN = \
5+
mc.csh.in \
6+
mc.fish.in \
7+
mc.sh.in \
8+
mc-wrapper.csh.in \
9+
mc-wrapper.fish.in \
10+
mc-wrapper.sh.in
11+
SCRIPTS_OUT = \
12+
mc.csh \
13+
mc.fish \
14+
mc.sh \
15+
mc-wrapper.csh \
16+
mc-wrapper.fish \
17+
mc-wrapper.sh
618

719
pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
820

@@ -17,17 +29,8 @@ EXTRA_DIST = \
1729
$(SCRIPTS_IN) \
1830
$(noinst_DATA)
1931

20-
mc.csh: $(top_builddir)/config.status $(srcdir)/mc.csh.in
21-
$(SED) "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.csh.in > mc.csh
32+
mc.%: $(top_builddir)/config.status $(srcdir)/mc.%.in
33+
$(SED) "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.$*.in > $@
2234

23-
mc.sh: $(top_builddir)/config.status $(srcdir)/mc.sh.in
24-
$(SED) "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.sh.in > mc.sh
25-
26-
mc-wrapper.csh: $(top_builddir)/config.status $(srcdir)/mc-wrapper.csh.in
27-
$(SED) "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.csh.in > mc-wrapper.csh
28-
29-
mc-wrapper.sh: $(top_builddir)/config.status $(srcdir)/mc-wrapper.sh.in
30-
$(SED) "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.sh.in > mc-wrapper.sh
31-
32-
mc-wrapper.sh: $(top_builddir)/config.status $(srcdir)/mc-wrapper.fish.in
33-
$(SED) "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.fish.in > mc-wrapper.fish
35+
mc-wrapper.%: $(top_builddir)/config.status $(srcdir)/mc-wrapper.%.in
36+
$(SED) "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.$*.in > $@

contrib/mc-wrapper.fish.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
if set -q MC_TMPDIR
2-
set MC_PWD_FILE (mktemp "$MC_TMPDIR/mc.pwd.XXXXXX")
2+
set MC_PWD_FILE (mktemp $MC_TMPDIR/mc.pwd.XXXXXX)
33
else if set -q TMPDIR
4-
set MC_PWD_FILE (mktemp "$TMPDIR/mc.pwd.XXXXXX")
4+
set MC_PWD_FILE (mktemp $TMPDIR/mc.pwd.XXXXXX)
55
else
6-
set MC_PWD_FILE (mktemp "/tmp/mc.pwd.XXXXXX")
6+
set MC_PWD_FILE (mktemp /tmp/mc.pwd.XXXXXX)
77
end
88

9-
@bindir@/mc -P "$MC_PWD_FILE" "$argv"
9+
@bindir@/mc -P "$MC_PWD_FILE" $argv
1010

1111
if test -r "$MC_PWD_FILE"
1212
set MC_PWD (cat $MC_PWD_FILE)
13-
if test -n "$MC_PWD" && test "$MC_PWD" != "$PWD" && test -d "$MC_PWD"
14-
cd "$MC_PWD"
13+
if test -n "$MC_PWD" && test $MC_PWD != $PWD && test -d $MC_PWD
14+
cd $MC_PWD
1515
end
1616
set -e MC_PWD
1717
end
1818

19-
rm -f "$MC_PWD_FILE"
19+
rm -f $MC_PWD_FILE
2020
set -e MC_PWD_FILE

contrib/mc.fish.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
function mc --description 'Visual shell for Unix-like systems - fish wrapper'
2+
source @pkglibexecdir@/mc-wrapper.fish $argv
3+
end

doc/man/es/mc.1.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ Midnight Commander. Consúltese en los archivos
9494
.B %pkglibexecdir%/mc.sh
9595
(usuarios de bash y zsh) y
9696
.B %pkglibexecdir%/mc.csh
97-
(usuarios de tcsh) la manera de definir
97+
(usuarios de tcsh)
98+
.B %pkglibexecdir%/mc.fish
99+
(usuarios de fish) la manera de definir
98100
.B mc
99101
como un alias para el correspondiente guión de shell.
100102
.TP

doc/man/hu/mc.1.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ helyett a Midnight Commander által utoljára meglátogatott könyvtárra való
6161
Fjerdingstad\-nek és Sergey\-nek közreműködésükért). Kérlek, ne csinálj
6262
szó szerinti másolatot a funkció beállításairól. A fájlok forrása a
6363
.I %pkglibexecdir%/mc.sh
64-
(bash és zsh felhasználóknak), illetőleg a
64+
(bash és zsh felhasználóknak),
6565
.I %pkglibexecdir%/mc.csh
66-
(tcsh felhasználóknak) fájl. Ilyenkor, amikor a funkció beállításokat
66+
(tcsh felhasználóknak) illetőleg a
67+
.I %pkglibexecdir%/mc.fish
68+
(fish felhasználóknak) fájl. Ilyenkor, amikor a funkció beállításokat
6769
változtatod, a profil értékeket nem szükséges megváltoztatnod, csak
6870
arról gondoskodj, hogy az MC\-t ne fordítsd eltérő beállításokkal.
6971
.PP

doc/man/it/mc.1.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ utilizzata da una speciale funzione shell che imposti automaticamente
8282
l'ultima directory corrente della shell come l'ultima directory in cui
8383
stava il Midnight Commander. Prelevate i file
8484
.B %pkglibexecdir%/mc.sh
85-
(utenti bash e zsh) o rispettivamente
85+
(utenti bash e zsh),
8686
.B %pkglibexecdir%/mc.csh
87-
(utenti tcsh) per definire
87+
(utenti tcsh) o rispettivamente
88+
.B %pkglibexecdir%/mc.fish
89+
(utenti fish) per definire
8890
.B mc
8991
come un alias allo script di shell appropriato.
9092
.TP

doc/man/mc.1.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ the last directory Midnight Commander was in. Source the file
8080
.B %pkglibexecdir%/mc.sh
8181
(bash and zsh users) or
8282
.B %pkglibexecdir%/mc.csh
83-
(tcsh users) respectively to define
83+
(tcsh users) or
84+
.B %pkglibexecdir%/mc.fish
85+
(fish users) respectively to define
8486
.B mc
8587
as an alias to the appropriate shell script.
8688
.TP

doc/man/ru/mc.1.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,10 @@ Commander.
9090
.IP
9191
Для того чтобы эта функция была определена, используйте файл
9292
.B %pkglibexecdir%/mc.sh
93-
для оболочек bash и zsh, а для оболочки tcsh соответственно файл
93+
для оболочек bash и zsh, или для оболочки tcsh файл
9494
.B %pkglibexecdir%/mc.csh
95+
а для оболочки fish соответственно файл
96+
.B %pkglibexecdir%/mc.fish
9597
.TP
9698
.I \-s, \-\-slow
9799
Включает медленный режим терминала, в котором программа выводит меньше

doc/man/sr/mc.1.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ termcap/terminfo. Корисно је само на ХП\-овим термин
6464
.B %pkglibexecdir%/mc.sh
6565
(за кориснике љуски bash и zsh) или
6666
.B %pkglibexecdir%/mc.csh
67-
(за кориснике љуске tcsh), тим редом, да бисте задали
67+
(за кориснике љуске tcsh) или
68+
.B %pkglibexecdir%/mc.fish
69+
(за кориснике љуске fish), тим редом, да бисте задали
6870
.B mc
6971
као надимак за одговарајући спис љуске.
7072
.TP

0 commit comments

Comments
 (0)