Fixed cd stuff and some minor bugs

[apt.git] / dselect / install

diff --git a/dselect/install b/dselect/install
index db96a80550be3a6eeadee61ddb39ba61c2908b46..6cf5dcf1addc61f0ae3aa5650b74187656d6260c 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -1,13 +1,14 @@
 #!/bin/sh
 
 # Get the configuration from /etc/apt/apt.conf
-CLEAN="auto"
+CLEAN="prompt"
 OPTS="-f"
 APTGET="/usr/bin/apt-get"
 DPKG="/usr/bin/dpkg"
 set -e
 RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::Options \
-                      DPKG Dir::Bin::dpkg APTGET Dir::Bin::apt-get`
+                      DPKG Dir::Bin::dpkg/ APTGET Dir::Bin::apt-get/ \
+                     ARCHIVES Dir::Cache::Archives/`
 eval $RES
 set +e
 
@@ -47,14 +48,23 @@ fi
 
 # Finished OK
 if [ $RES -eq 0 ]; then
+
+   if [ `ls $ARCHIVES $ARCHIVES/partial | egrep -v "^lock$|^partial$" | wc -l` \
+        -eq 0 ]; then
+      exit 0
+   fi
+   
    # Check the cleaning mode
    case `echo $CLEAN | tr '[:upper:]' '[:lower:]'` in
-     always|auto) 
+     auto)
+       $APTGET autoclean && echo "Press enter to continue." && read RES && exit 0;
+       ;;
+     always)
        $APTGET clean && echo "Press enter to continue." && read RES && exit 0;
        ;;
      prompt)
        exec 3>&1
-       if [ `yesno "Do you want to erase the downloaded files " y` = y ]; then
+       if [ `yesno "Do you want to erase the downloaded .deb files " y` = y ]; then
           $APTGET clean && echo "Press enter to continue." && read RES && exit 0;
        fi
        ;;