Bug fixes, new major version

[apt.git] / dselect / install

diff --git a/dselect/install b/dselect/install
index e1bea340d07ba67593839c78ff8633a7eecc39b3..3fbab73cfb3292b502fa67859a6ac34f711675ee 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -1,32 +1,34 @@
 #!/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/ \
+                     WAIT DSelect::WaitAfterDownload`
 eval $RES
 set +e
 
 # Yes/No Prompter
-function yesno() {
+yesno() {
 # $1 = prompt
 # $2 = default(y)
        local ans def defp
        if [ "$2" ];then
                case $2 in
-                       Y|y)    defp="(Y/n)" def=y;;
-                       N|n)    defp="(y/N)" def=n;;
+                       Y|y)    defp="[Y/n]" def=y;;
+                       N|n)    defp="[y/N]" def=n;;
                        *)      echo "Bad default setting!" 1>&2; exit 1;;
                esac
        else
-               defp="(y/N)" def=n
+               defp="[y/N]" def=n
        fi
        while :;do
-               echo -n "$1$defp" 1>&3
+               echo -n "$1 $defp" 1>&3
                read ans
                case $ans in
                        Y|y|N|n)        break;;
@@ -37,8 +39,16 @@ function yesno() {
        echo $ans | tr YN yn
 }
 
-$APTGET $OPTS dselect-upgrade
-RES=$?
+OLDLS=`ls -ld $ARCHIVES`
+if [ x$WAIT = "xyes" ]; then
+   $APTGET $OPTS -d dselect-upgrade
+   echo "Press enter to continue." && read RES
+   $APTGET $OPTS dselect-upgrade
+   RES=$?
+else
+   $APTGET $OPTS dselect-upgrade
+   RES=$?
+fi
 
 # 1 means the user choose no at the prompt
 if [ $RES -eq 1 ]; then
@@ -47,14 +57,28 @@ 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
+
+   NEWLS=`ls -ld $ARCHIVES`
+   if [ "x$OLDLS" == "x$NEWLS" ]; 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
        ;;