# HG changeset patch # User Christophe Lincoln # Date 1202303225 -3600 # Node ID abe47a57b67b3bc7327149c6beea5ed212d8ee31 # Parent a32f68caef5061d7fb9ac3d39641a5dbf8542b17 Support for dl packages.txt and SUGGESTED variable for pkg info diff -r a32f68caef50 -r abe47a57b67b tazpkg --- a/tazpkg Tue Feb 05 14:12:19 2008 +0100 +++ b/tazpkg Wed Feb 06 14:07:05 2008 +0100 @@ -245,8 +245,8 @@ if [ -f "description.txt" ]; then cp description.txt $ROOT$INSTALLED/$PACKAGE fi - if grep -q pre_install $ROOT$INSTALLED/$PACKAGE/receipt; then - # Execute post install commands. + # Pre install commands. + if grep -q ^pre_install $ROOT$INSTALLED/$PACKAGE/receipt; then pre_install $ROOT fi echo -n "Installing $PACKAGE... " @@ -256,8 +256,8 @@ echo -n "Removing all tmp files... " cd .. && rm -rf $TMP_DIR status - if grep -q post_install $ROOT$INSTALLED/$PACKAGE/receipt; then - # Execute post install commands. + # Post install commands. + if grep -q ^post_install $ROOT$INSTALLED/$PACKAGE/receipt; then post_install $ROOT fi cd $TOP_DIR @@ -447,7 +447,7 @@ if [ -n "$2" ]; then XHTML_LIST=$2 else - XHTML_LIST=packages.html + XHTML_LIST=installed-packages.html fi echo "" echo -e "\033[1mCreating xHTML list of installed packages\033[0m" @@ -533,6 +533,12 @@ if [ ! "$DEPENDS" = "" ]; then echo -e "Depends : $DEPENDS" fi + if [ ! "$SUGGESTED" = "" ]; then + echo -e "Suggested : $SUGGESTED" + fi + if [ ! "$BUILD_DEPENDS" = "" ]; then + echo -e "Build deps : $BUILD_DEPENDS" + fi if [ ! "$WANTED" = "" ]; then echo -e "Wanted src : $WANTED" fi @@ -733,6 +739,10 @@ echo "" echo -e "\033[1mRemoving :\033[0m $PACKAGE" echo "================================================================================" + # Pre remove commands. + if grep -q ^pre_remove $INSTALLED/$PACKAGE/receipt; then + pre_remove + fi echo -n "Removing all files installed..." for file in `cat $INSTALLED/$PACKAGE/files.list` do @@ -874,9 +884,11 @@ echo "" if [ -f "$LOCALSTATE/packages.list" ]; then echo -n "Creating backup of the last packages list..." + mv -f packages.txt packages.txt.bak 2>/dev/null mv -f packages.list packages.list.bak status fi + download packages.txt download packages.list if [ -f "$LOCALSTATE/packages.list.bak" ]; then diff -u packages.list.bak packages.list | grep ^+[a-z] > packages.diff