mirror of
https://github.com/jarun/nnn.git
synced 2024-11-24 03:41:27 +00:00
nuke: use macOS open when GUI enabled (#705)
* nuke: use macOS open when GUI enabled * nuke: use is_mac function to test for macOS This is consistent with how the imgur plugin does detection. * Add macOS open command to plugins * pskill: only execute if input is non-empty
This commit is contained in:
parent
d788566268
commit
1afdd48f5d
|
@ -29,5 +29,10 @@ case "$(file -biL "$entry")" in
|
|||
*text*)
|
||||
"${VISUAL:-$EDITOR}" "$entry" ;;
|
||||
*)
|
||||
xdg-open "$entry" >/dev/null 2>&1 ;;
|
||||
if uname | grep -q "Darwin"; then
|
||||
open "$entry" >/dev/null 2>&1
|
||||
else
|
||||
xdg-open "$entry" >/dev/null 2>&1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
|
|
@ -39,7 +39,11 @@ if [ -z "$1" ] || ! [ -s "$1" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if command -v imvr >/dev/null 2>&1; then
|
||||
if uname | grep -q "Darwin"; then
|
||||
if [ -f "$1" ]; then
|
||||
open "$1" >/dev/null 2>&1 &
|
||||
fi
|
||||
elif command -v imvr >/dev/null 2>&1; then
|
||||
if [ -f "$1" ]; then
|
||||
view_dir imvr "$1" >/dev/null 2>&1 &
|
||||
elif [ -d "$1" ] || [ -h "$1" ]; then
|
||||
|
|
21
plugins/nuke
21
plugins/nuke
|
@ -79,12 +79,19 @@ FNAME=$(basename "$1")
|
|||
EDITOR="${EDITOR:-vi}"
|
||||
PAGER="${PAGER:-less -R}"
|
||||
ext="${FNAME##*.}"
|
||||
if ! [ -z "$ext" ]; then
|
||||
if [ -n "$ext" ]; then
|
||||
ext="$(printf "%s" "${ext}" | tr '[:upper:]' '[:lower:]')"
|
||||
fi
|
||||
|
||||
is_mac() {
|
||||
uname | grep -q "Darwin"
|
||||
}
|
||||
|
||||
handle_pdf() {
|
||||
if [ "$GUI" -ne 0 ] && which zathura >/dev/null 2>&1; then
|
||||
if [ "$GUI" -ne 0 ] && is_mac; then
|
||||
open "${FPATH}" >/dev/null 2>&1 &
|
||||
exit 0
|
||||
elif [ "$GUI" -ne 0 ] && which zathura >/dev/null 2>&1; then
|
||||
zathura "${FPATH}" >/dev/null 2>&1 &
|
||||
exit 0
|
||||
elif which pdftotext >/dev/null 2>&1; then
|
||||
|
@ -120,7 +127,10 @@ handle_audio() {
|
|||
}
|
||||
|
||||
handle_video() {
|
||||
if [ "$GUI" -ne 0 ] && which smplayer >/dev/null 2>&1; then
|
||||
if [ "$GUI" -ne 0 ] && is_mac; then
|
||||
open "${FPATH}" >/dev/null 2>&1 &
|
||||
exit 0
|
||||
elif [ "$GUI" -ne 0 ] && which smplayer >/dev/null 2>&1; then
|
||||
smplayer "${FPATH}" >/dev/null 2>&1 &
|
||||
exit 0
|
||||
elif [ "$GUI" -ne 0 ] && which mpv >/dev/null 2>&1; then
|
||||
|
@ -294,7 +304,10 @@ handle_multimedia() {
|
|||
|
||||
## Image
|
||||
image/*)
|
||||
if [ "$GUI" -ne 0 ] && which imvr >/dev/null 2>&1; then
|
||||
if [ "$GUI" -ne 0 ] && is_mac; then
|
||||
open "${FPATH}" >/dev/null 2>&1 &
|
||||
exit 0
|
||||
elif [ "$GUI" -ne 0 ] && which imvr >/dev/null 2>&1; then
|
||||
load_dir imvr "${FPATH}" >/dev/null 2>&1 &
|
||||
exit 0
|
||||
elif [ "$GUI" -ne 0 ] && which sxiv >/dev/null 2>&1; then
|
||||
|
|
|
@ -29,5 +29,7 @@ if ! [ -z "$psname" ]; then
|
|||
fi
|
||||
|
||||
cmd="$(ps -ax | grep -iw "$psname" | "$fuzzy" | sed -e 's/^[ \t]*//' | cut -d' ' -f1)"
|
||||
if [ -n "$cmd" ]; then
|
||||
$sucmd kill -9 "$cmd"
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue