@@ -304,6 +304,19 @@ grep installed | sed 's/.*($.*$ installed.*/(\1) /' } +package_entry() +{ +if [ -s "$(dirname $0)/$SLITAZ_VERSION/$CATEGORY.html" ]; then + cat << _EOT_ +$PACKAGE $(installed_size $PACKAGE): $SHORT_DESC +_EOT_ +else + cat << _EOT_ +$PACKAGE $(installed_size $PACKAGE): $SHORT_DESC +_EOT_ +fi +} + # recursive dependencies scan dep_scan() { @@ -316,9 +329,7 @@ echo -n "$2" ( . $WOK/$i/receipt - cat << _EOT_ -$PACKAGE $(installed_size $PACKAGE): $SHORT_DESC -_EOT_ + package_entry ) fi [ -f $WOK/$i/receipt ] || continue @@ -365,8 +376,9 @@ } ' | while read pkg; do . $WOK/${pkg##*/}/receipt + package_entry cat << _EOT_ -$(echo ${pkg%/*} | sed 's|/| |g') $PACKAGE $(installed_size $PACKAGE): $SHORT_DESC +$(echo ${pkg%/*} | sed 's|/| |g') $(package_entry) _EOT_ done } @@ -396,10 +408,8 @@ pkg=${pkg%:} if [ "$pkg" != "$last" ]; then . $WOK/$pkg/receipt - cat << _EOT_ - -$PACKAGE $(installed_size $PACKAGE): $SHORT_DESC -_EOT_ + + package_entry last=$pkg fi echo " $file" @@ -494,9 +504,7 @@ continue fi . $WOK/$dep/receipt - cat << _EOT_ -$PACKAGE $(installed_size $PACKAGE): $SHORT_DESC -_EOT_ + package_entry done cat << _EOT_ @@ -508,9 +516,7 @@ BUILD_DEPENDS="" . $dep echo " $BUILD_DEPENDS " | grep -q " $SEARCH " && - cat << _EOT_ -$PACKAGE $(installed_size $PACKAGE): $SHORT_DESC -_EOT_ + package_entry done cat << _EOT_ @@ -552,7 +558,7 @@ . $WOK/$last/receipt cat << _EOT_ -$PACKAGE $SHORT_DESC +$(package_entry) _EOT_ ) fi @@ -587,9 +593,7 @@ grep -i $SEARCH $PACKAGES_REPOSITORY/packages.desc | \ sort | while read pkg extras ; do . $WOK/$pkg/receipt - cat << _EOT_ -$PACKAGE $(installed_size $PACKAGE): $SHORT_DESC -_EOT_ + package_entry done fi elif [ "$OBJECT" = "Tags" ]; then @@ -602,9 +606,7 @@ grep ^TAGS= $WOK/*/receipt | grep -i $SEARCH | \ sed "s|$WOK/$.*$/receipt:.*|\1|" | sort | while read pkg ; do . $WOK/$pkg/receipt - cat << _EOT_ -$PACKAGE $(installed_size $PACKAGE): $SHORT_DESC -_EOT_ + package_entry done elif [ "$OBJECT" = "Receipt" ]; then package_exist $SEARCH && cat << _EOT_ @@ -631,7 +633,7 @@ DESC=" description" [ -f $WOK/$pkg/description.txt ] || DESC="" cat << _EOT_ -$PACKAGE $(installed_size $PACKAGE): $SHORT_DESC$DESC +$(package_entry)$DESC _EOT_ done equiv=$PACKAGES_REPOSITORY/packages.equiv @@ -645,9 +647,7 @@ _EOT_ for pkg in $(grep $vpkg= $equiv | sed "s/$vpkg=//"); do . $WOK/${pkg#*:}/receipt - cat << _EOT_ -$PACKAGE $(installed_size $PACKAGE): $SHORT_DESC -_EOT_ + package_entry done done fi