From 510d76b6c87c4779a60519a94a5b0938809c1cb7 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Sat, 22 Dec 2018 00:32:04 -0500 Subject: libopkbuild: Use shpp --- (limited to 'lib/metadata') diff --git a/lib/metadata/proteanos.sh b/lib/metadata/proteanos.sh index 82713f1..bb07b6b 100644 --- a/lib/metadata/proteanos.sh +++ b/lib/metadata/proteanos.sh @@ -104,14 +104,14 @@ _ob_get_distrev_proteanos() _ob_get_system_arch_proteanos() { - cat '@@SYSCONFDIR@@/proteanos_arch' + cat "${SYSCONFDIR}/proteanos_arch" return 0 } _ob_get_system_plat_proteanos() { - cat '@@SYSCONFDIR@@/proteanos_plat' + cat "${SYSCONFDIR}/proteanos_plat" return 0 } @@ -144,7 +144,7 @@ _ob_get_system_path_proteanos() 'buildflags') # arch if [ ${#} -eq 1 ]; then - printf '@@DATADIR@@/opkbuild/buildflags/%s' "${1}" + printf "${DATADIR}/opkbuild/buildflags/%s" "${1}" else return 125 fi @@ -153,8 +153,8 @@ _ob_get_system_path_proteanos() # source version plat if [ ${#} -eq 3 ]; then ob_parse_version -u 'pkgver' "${2}" - printf '@@DATADIR@@/platconf/%s/%s\n' "${3}" "${1}" - printf '@@DATADIR@@/platconf/%s/%s_%s\n' "${3}" "${1}" \ + printf "${DATADIR}/platconf/%s/%s\n" "${3}" "${1}" + printf "${DATADIR}/platconf/%s/%s_%s\n" "${3}" "${1}" \ "${pkgver}" else return 125 -- cgit v0.9.1