From 94ccc094bb7e43caf7f46a2c4362ae265c524c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?= Date: Thu, 30 Mar 2023 11:36:31 +0200 Subject: Support nano in ./pkgtool.sh -e. --- pkgtool.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'pkgtool.sh') diff --git a/pkgtool.sh b/pkgtool.sh index a37e5c6c..9e26cc34 100755 --- a/pkgtool.sh +++ b/pkgtool.sh @@ -212,9 +212,10 @@ pkgtoolp_init_getopts_fn() { # {{{ pkgtoolp_edit($_rstatus, $_pkg_name) pkgtoolp_edit() { - local _ppe_rstatus="${1}" _ppe_pkg_name="${2}" \ - _ppe_fname="" _ppe_group_fname="" _ppe_group_name="" _ppe_patch_idx=0 _ppe_pkg_disabled="" \ - _ppe_pkg_finished="" _ppe_pkg_name_uc="" _ppe_pkg_names="" _ppe_pkg_vars="" _ppe_rc=0; + local _ppe_rstatus="${1}" _ppe_pkg_name="${2}" \ + _ppe_fname="" _ppe_group_fname="" _ppe_group_fname_nline="" _ppe_group_name="" \ + _ppe_patch_idx=0 _ppe_pkg_disabled="" _ppe_pkg_finished="" _ppe_pkg_name_uc="" \ + _ppe_pkg_names="" _ppe_pkg_vars="" _ppe_rc=0; rtl_toupper2 \$_ppe_pkg_name \$_ppe_pkg_name_uc; if ! ex_pkg_load_groups \$_ppe_groups \$_ppe_groups_noauto; then @@ -238,6 +239,16 @@ pkgtoolp_edit() { rtl_setrstatus "${_ppe_rstatus}" 'Error: \${EDITOR} unset.'; ;; + nano) + _ppe_group_fname_nline="$( \ + grep -n "PKG_${_ppe_pkg_name_uc}_" "${_ppe_group_fname}" |\ + awk -F: 'NR == 1 { print $1 }')"; + "${EDITOR}" \ + ${_ppe_group_fname_nline:+"+${_ppe_group_fname_nline}"} \ + "${_ppe_group_fname}" + _ppe_rc="${?}"; + ;; + vi|vim|nvi|nvim) "${EDITOR}" "${_ppe_group_fname}" "+/PKG_${_ppe_pkg_name_uc}_/"; _ppe_rc="${?}"; -- cgit v1.2.3