From 50c197ac632a35f3d8d012596f872a7854475030 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Thu, 19 Nov 2020 09:20:37 -0500 Subject: attachment fix; documentation fixes --- bin/openfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'bin/openfile') diff --git a/bin/openfile b/bin/openfile index f6668dc..cf3c6c3 100755 --- a/bin/openfile +++ b/bin/openfile @@ -1,9 +1,10 @@ #!/bin/sh # Helps open a file with xdg-open from mutt in a external program without weird side effects. -[ "$(uname)" = "Darwin" ] && opener="open" || opener="setsid xdg-open" -mkdir -p "/tmp/$USER-mutt-tmp" -file="/tmp/$USER-mutt-tmp/$(basename "$1")" -rm -f "$file" -cp "$1" "$file" -$opener "$file" >/dev/null 2>&1 & +tempdir="${XDG_CACHE_HOME:-$HOME/.cache}/mutt-wizard/files" +file="$tempdir/$(basename "$1")" +[ "$(uname)" = "Darwin" ] && opener="open" || opener="setsid -f xdg-open" +mkdir -p "$tempdir" +cp -f "$1" "$file" +$opener "$file" >/dev/null 2>&1 +find "${tempdir:?}" -mtime +1 -type f -delete -- cgit v1.2.3 From 95687867d1795299625e1e3dc5cdc412155de879 Mon Sep 17 00:00:00 2001 From: Jakub Kaczor Date: Sat, 9 Apr 2022 17:33:02 +0200 Subject: Hard link the file instead of copying In the latest neomutt release (2022-04-08), neomutt/neomutt/pull/3267 is merged. Neomutt doesn't overwrite files with zeros on closing anymore, just unlinks it. Therefore, instead of copying, files can be hard linked. --- bin/openfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/openfile') diff --git a/bin/openfile b/bin/openfile index cf3c6c3..5a250dc 100755 --- a/bin/openfile +++ b/bin/openfile @@ -5,6 +5,6 @@ tempdir="${XDG_CACHE_HOME:-$HOME/.cache}/mutt-wizard/files" file="$tempdir/$(basename "$1")" [ "$(uname)" = "Darwin" ] && opener="open" || opener="setsid -f xdg-open" mkdir -p "$tempdir" -cp -f "$1" "$file" +ln "$1" "$file" $opener "$file" >/dev/null 2>&1 find "${tempdir:?}" -mtime +1 -type f -delete -- cgit v1.2.3 From c7524bdd964b195ef67c40c38aba4e0501af24ef Mon Sep 17 00:00:00 2001 From: Jakub Kaczor Date: Sat, 9 Apr 2022 17:52:52 +0200 Subject: Force hard linking the file It was forgotten to add `-f` (force) option for `ln` in 95687867d1795299625e1e3dc5cdc412155de879. This enables opening files with the same names, but different contents, with a new NeoMutt instance, after the previous is closed. --- bin/openfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/openfile') diff --git a/bin/openfile b/bin/openfile index 5a250dc..a351f75 100755 --- a/bin/openfile +++ b/bin/openfile @@ -5,6 +5,6 @@ tempdir="${XDG_CACHE_HOME:-$HOME/.cache}/mutt-wizard/files" file="$tempdir/$(basename "$1")" [ "$(uname)" = "Darwin" ] && opener="open" || opener="setsid -f xdg-open" mkdir -p "$tempdir" -ln "$1" "$file" +ln -f "$1" "$file" $opener "$file" >/dev/null 2>&1 find "${tempdir:?}" -mtime +1 -type f -delete -- cgit v1.2.3 From 32d63b12dbda5fc2590176e1a99c7376e0395dc3 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Wed, 20 Apr 2022 14:19:48 -0400 Subject: Revert "Hard link the file instead of copying" This reverts commit 95687867d1795299625e1e3dc5cdc412155de879. --- bin/openfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/openfile') diff --git a/bin/openfile b/bin/openfile index a351f75..cf3c6c3 100755 --- a/bin/openfile +++ b/bin/openfile @@ -5,6 +5,6 @@ tempdir="${XDG_CACHE_HOME:-$HOME/.cache}/mutt-wizard/files" file="$tempdir/$(basename "$1")" [ "$(uname)" = "Darwin" ] && opener="open" || opener="setsid -f xdg-open" mkdir -p "$tempdir" -ln -f "$1" "$file" +cp -f "$1" "$file" $opener "$file" >/dev/null 2>&1 find "${tempdir:?}" -mtime +1 -type f -delete -- cgit v1.2.3 From 4911a7eff3471a144f7ea590bf6936cbd51d5689 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 30 Apr 2022 09:57:57 -0400 Subject: openfile to lib --- Makefile | 4 ++-- bin/openfile | 10 ---------- lib/openfile | 10 ++++++++++ 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100755 bin/openfile create mode 100755 lib/openfile (limited to 'bin/openfile') diff --git a/Makefile b/Makefile index b84dff1..0b610be 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ endif install: mkdir -p $(DESTDIR)$(PREFIX)/bin mkdir -p $(DESTDIR)$(PREFIX)/lib/mutt-wizard - cp -f bin/mw bin/mailsync bin/openfile $(DESTDIR)$(PREFIX)/bin/ - cp -f bin/openfile $(DESTDIR)$(PREFIX)/lib/mutt-wizard + cp -f bin/mw bin/mailsync $(DESTDIR)$(PREFIX)/bin/ + cp -f lib/openfile $(DESTDIR)$(PREFIX)/lib/mutt-wizard chmod 755 $(DESTDIR)$(PREFIX)/bin/mw $(DESTDIR)$(PREFIX)/bin/mailsync $(DESTDIR)$(PREFIX)/lib/mutt-wizard/openfile mkdir -p $(DESTDIR)$(PREFIX)/share/mutt-wizard chmod 755 $(DESTDIR)$(PREFIX)/share/mutt-wizard diff --git a/bin/openfile b/bin/openfile deleted file mode 100755 index cf3c6c3..0000000 --- a/bin/openfile +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Helps open a file with xdg-open from mutt in a external program without weird side effects. -tempdir="${XDG_CACHE_HOME:-$HOME/.cache}/mutt-wizard/files" -file="$tempdir/$(basename "$1")" -[ "$(uname)" = "Darwin" ] && opener="open" || opener="setsid -f xdg-open" -mkdir -p "$tempdir" -cp -f "$1" "$file" -$opener "$file" >/dev/null 2>&1 -find "${tempdir:?}" -mtime +1 -type f -delete diff --git a/lib/openfile b/lib/openfile new file mode 100755 index 0000000..0f60b10 --- /dev/null +++ b/lib/openfile @@ -0,0 +1,10 @@ +#!/bin/sh + +# Helps open a file with xdg-open from mutt in a external program without weird side effects. +tempdir="${XDG_CACHE_HOME:-$HOME/.cache}/mutt-wizard/files" +file="$tempdir/${1##*/}" +[ "$(uname)" = "Darwin" ] && opener="open" || opener="setsid -f xdg-open" +mkdir -p "$tempdir" +cp -f "$1" "$file" +$opener "$file" >/dev/null 2>&1 +find "${tempdir:?}" -mtime +1 -type f -delete -- cgit v1.2.3