瀏覽代碼

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
master
Gregory Anders GitHub 4 年之前
父節點
當前提交
1afdd48f5d
沒有發現已知的金鑰在資料庫的簽署中 GPG Key ID: 4AEE18F83AFDEB23
共有 4 個文件被更改,包括 31 次插入7 次删除
  1. +6
    -1
      plugins/fzopen
  2. +5
    -1
      plugins/imgview
  3. +17
    -4
      plugins/nuke
  4. +3
    -1
      plugins/pskill

+ 6
- 1
plugins/fzopen 查看文件

@@ -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

+ 5
- 1
plugins/imgview 查看文件

@@ -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


+ 17
- 4
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


+ 3
- 1
plugins/pskill 查看文件

@@ -29,5 +29,7 @@ if ! [ -z "$psname" ]; then
fi

cmd="$(ps -ax | grep -iw "$psname" | "$fuzzy" | sed -e 's/^[ \t]*//' | cut -d' ' -f1)"
$sucmd kill -9 "$cmd"
if [ -n "$cmd" ]; then
$sucmd kill -9 "$cmd"
fi
fi

Loading…
取消
儲存