From 1fc212398c58ef27963f84fa69df552acacf7767 Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Sun, 9 Aug 2009 02:50:34 +0000 Subject: jlanger failed to build my zsh. git-svn-id: http://svn.telesphoreo.org/trunk@647 514c082c-b64e-11dc-b46d-3d985efe055d --- control.sh | 86 +++++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 63 insertions(+), 23 deletions(-) (limited to 'control.sh') diff --git a/control.sh b/control.sh index 8a1f2c7ff..e82c45308 100755 --- a/control.sh +++ b/control.sh @@ -15,7 +15,7 @@ cat <= 1.14.25-8)" fi - echo -n " $(basename "${dep}" .dep)" - - ver=${PKG_DATA}/_metadata/${dep%.dep}.ver.${PKG_ARCH} - if [[ -e "${ver}" ]]; then - echo -n " (>= $(cat "${ver}"))" + if [[ -e ${PKG_DATA}/_metadata/predepends ]]; then + if [[ ${comma+@} == @ ]]; then + echo -n "," + else + echo -n "Pre-Depends:" + comma= + fi + + echo -n " $(cat "${PKG_DATA}/_metadata/predepends")" fi -done -if [[ -e ${PKG_DATA}/_metadata/depends ]]; then if [[ ${comma+@} == @ ]]; then - echo -n "," - else - echo -n "Depends:" - comma= + echo fi - - echo -n " $(cat "${PKG_DATA}/_metadata/depends")" fi -if [[ ${comma+@} == @ ]]; then - echo +if [[ ! -e ${PKG_DATA}/_metadata/depends_ ]]; then + unset comma + for dep in "${PKG_DEPS[@]}"; do + if [[ ${dep} == _* ]]; then + continue + fi + + if [[ ${comma+@} == @ ]]; then + echo -n "," + else + echo -n "Depends:" + comma= + fi + + echo -n " $(basename "${dep}" .dep)" + + ver=${PKG_DATA}/_metadata/${dep%.dep}.ver.${PKG_ARCH} + if [[ -e "${ver}" ]]; then + echo -n " (>= $(cat "${ver}"))" + fi + done + + if [[ -e ${PKG_DATA}/_metadata/depends ]]; then + if [[ ${comma+@} == @ ]]; then + echo -n "," + else + echo -n "Depends:" + comma= + fi + + echo -n " $(cat "${PKG_DATA}/_metadata/depends")" + fi + + if [[ ${comma+@} == @ ]]; then + echo + fi +elif [[ -s ${PKG_DATA}/_metadata/depends_ ]]; then + echo "Depends: $(cat "${PKG_DATA}/_metadata/depends_")" fi if [[ -e ${PKG_DATA}/_metadata/replaces ]]; then -- cgit v1.2.3