From c6d6e08feab839a9dc5792071fb803494cc51a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Wed, 26 Feb 2020 21:54:12 +0000
Subject: General cleanup, pt. II.

---
 subr/pkg_install_libs.subr | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'subr/pkg_install_libs.subr')

diff --git a/subr/pkg_install_libs.subr b/subr/pkg_install_libs.subr
index 379a0374..a00f15bb 100644
--- a/subr/pkg_install_libs.subr
+++ b/subr/pkg_install_libs.subr
@@ -5,7 +5,7 @@
 pkgp_install_libs_purge_la() {
 	local _la_path="";
 	for _la_path in $(find "${PKG_DESTDIR}" -type f -name \*.la); do
-		ex_rtl_fileop rm "${_la_path}" || return "${?}";
+		rtl_fileop rm "${_la_path}" || return "${?}";
 	done;
 };
 
@@ -14,8 +14,8 @@ pkgp_install_libs_shared_link() {
 	if _lib_link_tgt="$(find "${_so_dir}" -name "${_lib_name%%.*}.*.lib.a" | sort | tail -1)"\
 	&& [ -n "${_lib_link_tgt}" ]\
 	&& [ "${_lib_link_tgt}" != "${_lib_link_path}" ]; then
-		if ! ex_rtl_fileop rm "${_lib_link_path}"\
-		|| ! ex_rtl_fileop ln_symbolic "$(ex_rtl_basename "${_lib_link_tgt}")" "${_lib_link_path}"; then
+		if ! rtl_fileop rm "${_lib_link_path}"\
+		|| ! rtl_fileop ln_symbolic "$(rtl_basename "${_lib_link_tgt}")" "${_lib_link_path}"; then
 			return 1;
 		fi;
 	fi;
@@ -28,21 +28,21 @@ pkgp_install_libs_shared() {
 			$(find	"${PKG_DESTDIR}"							  \
 				\(  -name "*.so" -or -name "*.so.*" \) -print);
 		do	if [ "$(readlink -f "${_so_path}")" != "/dev/null" ]\
-			&& [ -z "$(ex_rtl_head "[0-9.]" "${_so_src_path##*.so}")" ]; then
+			&& [ -z "$(rtl_head "[0-9.]" "${_so_src_path##*.so}")" ]; then
 				case "${_so_src_path}" in
 				*.so)	_lib_src_path="${_so_src_path%%.so}.lib.a"; ;;
 				*.so.*)	_lib_src_path="${_so_src_path%%.so.*}.${_so_src_path##*.so.}.lib.a"; ;;
 				esac;
 				_so_dst_dir="${_so_src_path%/*}";
-				_lib_name="$(ex_rtl_basename "${_lib_src_path}")";
+				_lib_name="$(rtl_basename "${_lib_src_path}")";
 				_lib_dst_path="${_so_dst_dir}/${_lib_name}";
 				if [ ! -L "${_lib_src_path}" ]\
 				&& [ ! -e "${_lib_dst_path}" ]; then
-					(ex_rtl_fileop cd "$(ex_rtl_dirname "${_so_src_path}")" 	&&\
-					perk -e "$(ex_rtl_basename "${_so_src_path}")"			 |\
+					(rtl_fileop cd "$(rtl_dirname "${_so_src_path}")" 	&&\
+					perk -e "$(rtl_basename "${_so_src_path}")"			 |\
 						"${PKG_TARGET}-mdso"					  \
-							-i "$(ex_rtl_basename "${_lib_dst_path}")"	  \
-							-n "$(ex_rtl_basename "${_so_src_path}")" -) || return "${?}";
+							-i "$(rtl_basename "${_lib_dst_path}")"	  \
+							-n "$(rtl_basename "${_so_src_path}")" -) || return "${?}";
 				fi;
 				pkgp_install_libs_shared_link "${_lib_name}" "${_so_dst_dir}" "${_so_src_path}" || return "${?}";
 			fi;
-- 
cgit v1.2.3