debian/NEWS: Mention new pinning algorithm added in 2.0~exp1

[apt.git] / dselect / install

diff --git a/dselect/install b/dselect/install
index 61d13208e2f9c0d2fc1fa56036edd777d731c129..75f0c0fc4bf2300751c247b6725305cdc9c07329 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -5,18 +5,19 @@ TEXTDOMAIN="apt"
 
 # Get the configuration from /etc/apt/apt.conf
 CLEAN="prompt"
 
 # Get the configuration from /etc/apt/apt.conf
 CLEAN="prompt"

-OPTS="-f"
+OPTS=""
+DSELECT_UPGRADE_OPTS="-f"

 APTGET="/usr/bin/apt-get"
 DPKG="/usr/bin/dpkg"
 DPKG_OPTS="--admindir=$1"
 APT_OPT0="-oDir::State::status=$1/status"
 APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
 set -e
 APTGET="/usr/bin/apt-get"
 DPKG="/usr/bin/dpkg"
 DPKG_OPTS="--admindir=$1"
 APT_OPT0="-oDir::State::status=$1/status"
 APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"
 set -e

-RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::Options \
+RES=$(apt-config shell CLEAN DSelect::Clean OPTS DSelect::Options \

                       DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
                      ARCHIVES Dir::Cache::Archives/d \
                      WAIT DSelect::WaitAfterDownload/b \
                       DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
                      ARCHIVES Dir::Cache::Archives/d \
                      WAIT DSelect::WaitAfterDownload/b \

-                     CHECKDIR DSelect::CheckDir/b`
+                     CHECKDIR DSelect::CheckDir/b)

 eval $RES
 set +e
 
 eval $RES
 set +e
 


@@ -46,13 +47,13 @@ yesno() {
        echo $ans | tr YN yn
 }
 
        echo $ans | tr YN yn
 }
 

-if [ x$WAIT = "xtrue" ]; then
-   $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade
-   echo $"Press enter to continue." && read RES
-   $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade
+if [ "$WAIT" = "true" ]; then
+   $APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade
+   echo $"Press [Enter] to continue." && read RES
+   $APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade

    RES=$?
 else
    RES=$?
 else

-   $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade
+   $APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade

    RES=$?
 fi
 
    RES=$?
 fi
 


@@ -64,45 +65,45 @@ fi
 # Finished OK
 if [ $RES -eq 0 ]; then
 
 # Finished OK
 if [ $RES -eq 0 ]; then
 

-   if [ `ls $ARCHIVES $ARCHIVES/partial | egrep -v "^lock$|^partial$" | wc -l` \
+   if [ $(ls $ARCHIVES $ARCHIVES/partial | grep -E -v "^lock$|^partial$" | wc -l) \

         -eq 0 ]; then
       exit 0
    fi
 
         -eq 0 ]; then
       exit 0
    fi
 

-   NEWLS=`ls -ld $ARCHIVES`
-   if [ x$CHECKDIR = "xtrue" ]; then
-      if [ "x$OLDLS" = "x$NEWLS" ]; then
+   NEWLS=$(ls -ld $ARCHIVES)
+   if [ "$CHECKDIR" = "true" ]; then
+      if [ "$OLDLS" = "$NEWLS" ]; then

          exit 0
       fi
    fi
    
    # Check the cleaning mode
          exit 0
       fi
    fi
    
    # Check the cleaning mode

-   case `echo $CLEAN | tr '[:upper:]' '[:lower:]'` in
+   case $(echo $CLEAN | tr '[:upper:]' '[:lower:]') in

      auto)
        $APTGET "$APT_OPT0" "$APT_OPT1" autoclean &&
      auto)
        $APTGET "$APT_OPT0" "$APT_OPT1" autoclean &&

-          echo $"Press enter to continue." && read RES && exit 0;
+          echo $"Press [Enter] to continue." && read RES && exit 0;

        ;;
      always)
        $APTGET "$APT_OPT0" "$APT_OPT1" clean &&
        ;;
      always)
        $APTGET "$APT_OPT0" "$APT_OPT1" clean &&

-          echo $"Press enter to continue." && read RES && exit 0;
+          echo $"Press [Enter] to continue." && read RES && exit 0;

        ;;
      prompt)
        exec 3>&1
        echo -n $"Do you want to erase any previously downloaded .deb files?"
        ;;
      prompt)
        exec 3>&1
        echo -n $"Do you want to erase any previously downloaded .deb files?"

-       if [ `yesno "" y` = y ]; then
+       if [ $(yesno "" y) = y ]; then

           $APTGET "$APT_OPT0" "$APT_OPT1" clean &&
           $APTGET "$APT_OPT0" "$APT_OPT1" clean &&

-           echo $"Press enter to continue." && read RES && exit 0;
+           echo $"Press [Enter] to continue." && read RES && exit 0;

        fi
        ;;
      *) 
        ;;
    esac   
 else
        fi
        ;;
      *) 
        ;;
    esac   
 else

-   echo $"Some errors occurred while unpacking. I'm going to configure the"
-   echo $"packages that were installed. This may result in duplicate errors"
+   echo $"Some errors occurred while unpacking. Packages that were installed"
+   echo $"will be configured. This may result in duplicate errors"

    echo $"or errors caused by missing dependencies. This is OK, only the errors"
    echo $"above this message are important. Please fix them and run [I]nstall again"
    echo $"or errors caused by missing dependencies. This is OK, only the errors"
    echo $"above this message are important. Please fix them and run [I]nstall again"

-   echo $"Press enter to continue."
+   echo $"Press [Enter] to continue."

    read RES && $DPKG "$DPKG_OPTS" --configure -a
    exit 100
 fi
    read RES && $DPKG "$DPKG_OPTS" --configure -a
    exit 100
 fi