Merge pull request #749 from dylanaraps/scrot

scrot: Skip "import" on MacOS
This commit is contained in:
Dylan Araps 2017-06-15 19:41:36 +10:00 committed by GitHub
commit 55c772a3cf
1 changed files with 2 additions and 2 deletions

View File

@ -248,7 +248,7 @@ get_model() {
fi fi
;; ;;
"Mac OS X") "Mac OS X")
if [[ "$(kextstat | grep "FakeSMC")" != "" ]]; then if [[ "$(kextstat | grep "FakeSMC")" != "" ]]; then
model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" model="Hackintosh (SMBIOS: $(sysctl -n hw.model))"
else else
@ -2662,7 +2662,7 @@ scrot_program() {
elif type -p maim >/dev/null; then elif type -p maim >/dev/null; then
scrot_program=(maim) scrot_program=(maim)
elif type -p import >/dev/null; then elif type -p import >/dev/null && [[ "$os" != "Mac OS X" ]]; then
scrot_program=(import -window root) scrot_program=(import -window root)
elif type -p imlib2_grab >/dev/null; then elif type -p imlib2_grab >/dev/null; then