etc-update: handle emacs diff cmd, bug #409849
authorZac Medico <zmedico@gentoo.org>
Tue, 27 Mar 2012 17:35:44 +0000 (10:35 -0700)
committerZac Medico <zmedico@gentoo.org>
Tue, 27 Mar 2012 17:35:44 +0000 (10:35 -0700)
bin/etc-update

index 794271ff42fae9285a0928a019a0b8d9f4f69346..1edc91fab70a19dbcaabed0d73f17072f0917490 100755 (executable)
@@ -676,7 +676,9 @@ if [[ ${using_editor} == "0" ]] ; then
                die "'${diff_command}' does not seem to work, aborting"
        fi
 else
-       if ! cmd_var_is_valid "${diff_command}" ; then
+       # NOTE: cmd_var_is_valid doesn't work with diff_command="eval emacs..."
+       # because it uses type -P.
+       if ! type ${diff_command%%[[:space:]]*} >/dev/null; then
                die "'${diff_command}' does not seem to work, aborting"
        fi
 fi