From cef78436242f8a9f4c72953dcfe457aae2016ba1 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 22 Dec 2018 22:19:55 -0500 Subject: metadata: Drop system name from function names --- diff --git a/lib/metadata.sh b/lib/metadata.sh index e5e61d8..e9a30b3 100644 --- a/lib/metadata.sh +++ b/lib/metadata.sh @@ -307,7 +307,7 @@ _ob_metadata_do() func="${1}" shift 1 - "_ob_${func}_${METADATA}" "${@}" + "_ob_${func}" "${@}" return ${?} } diff --git a/lib/metadata/proteanos.sh b/lib/metadata/proteanos.sh index 51f655e..2ac6c0e 100644 --- a/lib/metadata/proteanos.sh +++ b/lib/metadata/proteanos.sh @@ -25,7 +25,7 @@ _OB_VERSION_RE_PROTEANOS=${_OB_VERSION_RE_PROTEANOS}'(-[1-9][0-9]*)?' _OB_VERSION_RE_PROTEANOS=${_OB_VERSION_RE_PROTEANOS}'(\+[a-z0-9]+~[1-9][0-9]*)?' _OB_VERSION_RE_PROTEANOS=${_OB_VERSION_RE_PROTEANOS}'$' -_ob_validate_source_name_proteanos() +_ob_validate_source_name() { local name= @@ -45,7 +45,7 @@ _ob_validate_source_name_proteanos() return 0 } -_ob_validate_binary_name_proteanos() +_ob_validate_binary_name() { local name= @@ -65,7 +65,7 @@ _ob_validate_binary_name_proteanos() return 0 } -_ob_validate_version_proteanos() +_ob_validate_version() { local version= @@ -77,7 +77,7 @@ _ob_validate_version_proteanos() return ${?} } -_ob_get_upstreamver_proteanos() +_ob_get_upstreamver() { local version= @@ -88,7 +88,7 @@ _ob_get_upstreamver_proteanos() return 0 } -_ob_get_distrev_proteanos() +_ob_get_distrev() { local version= @@ -99,21 +99,21 @@ _ob_get_distrev_proteanos() return 0 } -_ob_get_system_arch_proteanos() +_ob_get_system_arch() { cat "${SYSCONFDIR}/proteanos_arch" return 0 } -_ob_get_system_plat_proteanos() +_ob_get_system_plat() { cat "${SYSCONFDIR}/proteanos_plat" return 0 } -_ob_get_system_path_proteanos() +_ob_get_system_path() { local path_id= local pkgver= -- cgit v0.9.1