3 if [ $# -eq 3 -a "$2" = '-d' ]; then
5 elif [ $# -ne 1 ]; then
6 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
10 -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;;
11 -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;;
13 echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
18 # DP: Use `command -v editor`, as an editor, if available.
20 --- bash/builtins/fc.def~ 2005-10-13 18:11:24.798452832 +0200
21 +++ bash/builtins/fc.def 2005-10-13 19:36:11.956087320 +0200
25 /* String to execute on a file that we want to edit. */
26 -#define FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-vi}}"
27 +#define FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-$(command -v editor || echo vi)}}"
28 #if defined (STRICT_POSIX)
29 # define POSIX_FC_EDIT_COMMAND "${FCEDIT:-ed}"
31 -# define POSIX_FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-ed}}"
32 +# define POSIX_FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-$(command -v editor || echo ed)}}"
36 --- bash/bashline.c~ 2005-10-13 18:11:24.827448424 +0200
37 +++ bash/bashline.c 2005-10-13 19:37:35.382404592 +0200
39 command being entered (if no explicit argument is given), otherwise on
40 a command from the history file. */
42 -#define VI_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-vi}}\""
43 -#define EMACS_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-emacs}}\""
44 +#define VI_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-$(command -v editor || echo vi)}}\""
45 +#define EMACS_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-$(command -v editor || echo emacs)}}\""
46 #define POSIX_VI_EDIT_COMMAND "fc -e vi"