From 9296f0bd6d56869a9b013a5475777a612a9ef5ac Mon Sep 17 00:00:00 2001 From: Xander Ziiryanoff Date: Sun, 14 Feb 2016 08:40:57 +0300 Subject: [PATCH] Ticket #3574: fix XDG silent open in background. This bug was introduced in 0516ccd3259600d6010cf6d9282b4411b83eb008. Signed-off-by: Andrew Borodin --- misc/ext.d/archive.sh | 2 +- misc/ext.d/doc.sh.in | 2 +- misc/ext.d/image.sh | 2 +- misc/ext.d/misc.sh.in | 2 +- misc/ext.d/package.sh | 2 +- misc/ext.d/sound.sh | 2 +- misc/ext.d/text.sh.in | 2 +- misc/ext.d/video.sh | 2 +- misc/ext.d/web.sh.in | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/misc/ext.d/archive.sh b/misc/ext.d/archive.sh index 91f8c50fc..e6105fdc1 100755 --- a/misc/ext.d/archive.sh +++ b/misc/ext.d/archive.sh @@ -171,7 +171,7 @@ view) do_view_action "${filetype}" ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \ + ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" "${pager}" ;; *) diff --git a/misc/ext.d/doc.sh.in b/misc/ext.d/doc.sh.in index e2d4b6cda..c8e83cfee 100644 --- a/misc/ext.d/doc.sh.in +++ b/misc/ext.d/doc.sh.in @@ -187,7 +187,7 @@ view) do_view_action "${filetype}" ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \ + ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" ;; *) diff --git a/misc/ext.d/image.sh b/misc/ext.d/image.sh index 6535554a2..05161adba 100755 --- a/misc/ext.d/image.sh +++ b/misc/ext.d/image.sh @@ -57,7 +57,7 @@ view) do_view_action "${filetype}" ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \ + ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" ;; *) diff --git a/misc/ext.d/misc.sh.in b/misc/ext.d/misc.sh.in index 3d3767d87..e76025ead 100644 --- a/misc/ext.d/misc.sh.in +++ b/misc/ext.d/misc.sh.in @@ -88,7 +88,7 @@ view) do_view_action "${filetype}" ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \ + ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" ;; *) diff --git a/misc/ext.d/package.sh b/misc/ext.d/package.sh index 07be8ee4c..fc1aa1f1d 100755 --- a/misc/ext.d/package.sh +++ b/misc/ext.d/package.sh @@ -51,7 +51,7 @@ view) do_view_action "${filetype}" ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \ + ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" ;; *) diff --git a/misc/ext.d/sound.sh b/misc/ext.d/sound.sh index b10d50af3..a7b6025dc 100755 --- a/misc/ext.d/sound.sh +++ b/misc/ext.d/sound.sh @@ -84,7 +84,7 @@ view) do_view_action "${filetype}" ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \ + ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" ;; *) diff --git a/misc/ext.d/text.sh.in b/misc/ext.d/text.sh.in index 28aa337c7..b47425876 100644 --- a/misc/ext.d/text.sh.in +++ b/misc/ext.d/text.sh.in @@ -141,7 +141,7 @@ view) do_view_action "${filetype}" ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \ + ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" "${pager}" ;; *) diff --git a/misc/ext.d/video.sh b/misc/ext.d/video.sh index 42104af52..ff038c832 100755 --- a/misc/ext.d/video.sh +++ b/misc/ext.d/video.sh @@ -43,7 +43,7 @@ view) do_view_action "${filetype}" ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \ + ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" ;; *) diff --git a/misc/ext.d/web.sh.in b/misc/ext.d/web.sh.in index 2a57c952b..4a86e9401 100644 --- a/misc/ext.d/web.sh.in +++ b/misc/ext.d/web.sh.in @@ -46,7 +46,7 @@ view) do_view_action "${filetype}" ;; open) - ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) || \ + ("${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" >/dev/null 2>&1) || \ do_open_action "${filetype}" ;; *)