diff options
Diffstat (limited to 'src/feed.sh')
| -rw-r--r-- | src/feed.sh | 73 |
1 files changed, 37 insertions, 36 deletions
diff --git a/src/feed.sh b/src/feed.sh index 8b27723..d111474 100644 --- a/src/feed.sh +++ b/src/feed.sh @@ -18,16 +18,16 @@ # along with the ProteanOS Development Kit. If not, see # <http://www.gnu.org/licenses/>. -feed_dep_fields= -feed_pkg_cb= -feed_deps_cb= -feed_fname_cb= -feed_md5sum_cb= -feed_sha256sum_cb= -feed_pkgs= -feed_pkg_include= -feed_pkg= -feed_deps= +_feed_dep_fields= +_feed_pkg_cb= +_feed_deps_cb= +_feed_fname_cb= +_feed_md5sum_cb= +_feed_sha256sum_cb= +_feed_pkgs= +_feed_pkg_include= +_feed_pkg= +_feed_deps= feed_download() { @@ -121,19 +121,20 @@ _feed_field_cb() name="$(printf '%s\n' "${name}" | tr 'A-Z' 'a-z')" if [ "x${name}" = 'xpackage' ]; then - feed_pkg="${value}" + _feed_pkg="${value}" elif [ "x${name}" = 'xfilename' ]; then - ${feed_fname_cb} "${feed_pkg}" "${value}" + ${_feed_fname_cb} "${_feed_pkg}" "${value}" elif [ "x${name}" = 'xmd5sum' ]; then - ${feed_md5sum_cb} "${feed_pkg}" "${value}" + ${_feed_md5sum_cb} "${_feed_pkg}" "${value}" elif [ "x${name}" = 'xsha256sum' ]; then - ${feed_sha256sum_cb} "${feed_pkg}" "${value}" - elif [ "x${feed_dep_fields#* ${name} }" != "x${feed_dep_fields}" ]; then - feed_deps="${feed_deps}${value}, " + ${_feed_sha256sum_cb} "${_feed_pkg}" "${value}" + elif [ "x${_feed_dep_fields#* ${name} }" != "x${_feed_dep_fields}" ] + then + _feed_deps="${_feed_deps}${value}, " fi - if ${feed_pkg_cb} ${name} ${value}; then - feed_pkg_include='true' + if ${_feed_pkg_cb} ${name} ${value}; then + _feed_pkg_include='true' fi return 0 @@ -144,13 +145,13 @@ _feed_para_cb() local new_deps= local dep= - if ${feed_pkg_include}; then - feed_pkgs="${feed_pkgs} ${feed_pkg}" + if ${_feed_pkg_include}; then + _feed_pkgs="${_feed_pkgs} ${_feed_pkg}" fi new_deps='' IFS=',' - for dep in ${feed_deps%, }; do + for dep in ${_feed_deps%, }; do unset IFS # Trim off versions and disjunctions. dep="${dep%%(*}" @@ -165,11 +166,11 @@ _feed_para_cb() done unset IFS - ${feed_deps_cb} "${feed_pkg}" "${new_deps# }" + ${_feed_deps_cb} "${_feed_pkg}" "${new_deps# }" - feed_pkg_include='false' - feed_pkg='' - feed_deps='' + _feed_pkg_include='false' + _feed_pkg='' + _feed_deps='' return 0 } @@ -185,24 +186,24 @@ feed_find_pkgs() local sha256sum_cb="${7}" shift 7 - feed_dep_fields=" $(printf '%s ' ${dep_fields} | tr 'A-Z' 'a-z')" - feed_pkg_cb="${pkg_cb}" - feed_deps_cb="${deps_cb}" - feed_fname_cb="${fname_cb}" - feed_md5sum_cb="${md5sum_cb}" - feed_sha256sum_cb="${sha256sum_cb}" + _feed_dep_fields=" $(printf '%s ' ${dep_fields} | tr 'A-Z' 'a-z')" + _feed_pkg_cb="${pkg_cb}" + _feed_deps_cb="${deps_cb}" + _feed_fname_cb="${fname_cb}" + _feed_md5sum_cb="${md5sum_cb}" + _feed_sha256sum_cb="${sha256sum_cb}" - feed_pkgs='' - feed_pkg_include='false' - feed_pkg='' - feed_deps='' + _feed_pkgs='' + _feed_pkg_include='false' + _feed_pkg='' + _feed_deps='' parse_control '-' _feed_field_cb _feed_para_cb 'Package' <<-EOF $({ ${GUNZIP} -c -- "${feed_idx}" || cat "${feed_idx}"; } \ 2>/dev/null) EOF - printf '%s\n' "${feed_pkgs# }" + printf '%s\n' "${_feed_pkgs# }" return 0 } |