From 074fe6fe2b03f36629b13d7b881fa86afa0581c5 Mon Sep 17 00:00:00 2001
From: Koichi Murase <myoga.murase@gmail.com>
Date: Fri, 16 Sep 2022 20:17:42 +0900
Subject: [PATCH] aliases/general(cp,mv,mkdir): Fix command-not-found by
 expanded aliases in functions

---
 aliases/general.aliases.sh | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/aliases/general.aliases.sh b/aliases/general.aliases.sh
index f591ca3..11a23ba 100644
--- a/aliases/general.aliases.sh
+++ b/aliases/general.aliases.sh
@@ -25,30 +25,27 @@
 # Ref. https://github.com/ohmybash/oh-my-bash/issues/351
 function _omb_alias_general_cp_init {
   if (tmp=$(_omb_util_mktemp); trap 'rm -f "$tmp"{,.2}' EXIT; command cp -v "$tmp" "$tmp.2" &>/dev/null); then
-    alias cp='cp -iv' && unset -f "$FUNCNAME"
-    command cp -iv "$@"
+    alias cp='cp -iv' && function _omb_alias_general_cp_init { command cp -iv "$@"; }
   else
-    alias cp='cp -i' && unset -f "$FUNCNAME"
-    command cp -i "$@"
-  fi
+    alias cp='cp -i' && function _omb_alias_general_cp_init { command cp -i "$@"; }
+  fi &&
+    _omb_alias_general_cp_init "$@"
 }
 function _omb_alias_general_mv_init {
   if (tmp=$(_omb_util_mktemp); trap 'rm -f "$tmp.2"' EXIT; command mv -v "$tmp" "$tmp.2" &>/dev/null); then
-    alias mv='mv -iv' && unset -f "$FUNCNAME"
-    command mv -iv "$@"
+    alias mv='mv -iv' && function _omb_alias_general_mv_init { command mv -iv "$@"; }
   else
-    alias mv='mv -i' && unset -f "$FUNCNAME"
-    command mv -i "$@"
-  fi
+    alias mv='mv -i' && function _omb_alias_general_mv_init { command mv -i "$@"; }
+  fi &&
+    _omb_alias_general_mv_init "$@"
 }
 function _omb_alias_general_mkdir_init {
   if command mkdir -pv . &>/dev/null; then
-    alias mkdir='mkdir -pv' && unset -f "$FUNCNAME"
-    command mkdir -pv "$@"
+    alias mkdir='mkdir -pv' && function _omb_alias_general_mkdir_init { command mkdir -pv "$@"; }
   else
-    alias mkdir='mkdir -p' && unset -f "$FUNCNAME"
-    command mkdir -p "$@"
-  fi
+    alias mkdir='mkdir -p' && function _omb_alias_general_mkdir_init { command mkdir -p "$@"; }
+  fi &&
+    _omb_alias_general_mkdir_init "$@"
 }
 
 alias cp='_omb_alias_general_cp_init'       # Preferred 'cp' implementation