support (multiple) arguments properly in apt-key

[apt.git] / dselect / install

diff --git a/dselect/install b/dselect/install
index 7c42374580e44aa5fa5fb3fa8e2a42c20306a830..7104ee280cd74399ded16413023f840fe583492d 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -1,32 +1,42 @@
-#!/bin/sh
+#!/bin/bash
+
+# Set the textdomain for the translations using $"..."
+TEXTDOMAIN="apt"

 
 # Get the configuration from /etc/apt/apt.conf
 
 # Get the configuration from /etc/apt/apt.conf

-CLEAN="auto"
-OPTS="-f"
+CLEAN="prompt"
+OPTS=""
+DSELECT_UPGRADE_OPTS="-f"

 APTGET="/usr/bin/apt-get"
 DPKG="/usr/bin/dpkg"
 APTGET="/usr/bin/apt-get"
 DPKG="/usr/bin/dpkg"

-sh -e
-RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::Options \
-                      DPKG Dir::Bin::dpkg APTGET Dir::Bin::apt-get`
+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 \
+                      DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
+                     ARCHIVES Dir::Cache::Archives/d \
+                     WAIT DSelect::WaitAfterDownload/b \
+                     CHECKDIR DSelect::CheckDir/b)

 eval $RES
 eval $RES

-sh +e
+set +e

 
 # Yes/No Prompter
 
 # Yes/No Prompter

-function yesno() {
+yesno() {

 # $1 = prompt
 # $2 = default(y)
        local ans def defp
        if [ "$2" ];then
                case $2 in
 # $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;;
-                       *)      echo "Bad default setting!" 1>&2; exit 1;;
+                       Y|y)    defp="[Y/n]" def=y;;
+                       N|n)    defp="[y/N]" def=n;;
+                       *)      echo $"Bad default setting!" 1>&2; exit 1;;

                esac
        else
                esac
        else

-               defp="(y/N)" def=n
+               defp="[y/N]" def=n

        fi
        while :;do
        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;;
                read ans
                case $ans in
                        Y|y|N|n)        break;;


@@ -37,8 +47,15 @@ function yesno() {
        echo $ans | tr YN yn
 }
 
        echo $ans | tr YN yn
 }
 

-#$APTGET $OPTS dselect-upgrade
-RES=$?
+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
+   $APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade
+   RES=$?
+fi

 
 # 1 means the user choose no at the prompt
 if [ $RES -eq 1 ]; then
 
 # 1 means the user choose no at the prompt
 if [ $RES -eq 1 ]; then


@@ -47,27 +64,47 @@ 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) \
+        -eq 0 ]; then
+      exit 0
+   fi
+
+   NEWLS=$(ls -ld $ARCHIVES)
+   if [ "$CHECKDIR" = "true" ]; then
+      if [ "$OLDLS" = "$NEWLS" ]; then
+         exit 0
+      fi
+   fi
+   

    # Check the cleaning mode
    # Check the cleaning mode

-   case `echo $CLEAN | tr '[:upper:]' '[:lower:]'` in
-     always|auto) 
-       $APTGET clean && echo "Press enter to continue." && read RES && exit 0;
+   case $(echo $CLEAN | tr '[:upper:]' '[:lower:]') in
+     auto)
+       $APTGET "$APT_OPT0" "$APT_OPT1" autoclean &&
+          echo $"Press enter to continue." && read RES && exit 0;
+       ;;
+     always)
+       $APTGET "$APT_OPT0" "$APT_OPT1" clean &&
+          echo $"Press enter to continue." && read RES && exit 0;

        ;;
      prompt)
        exec 3>&1
        ;;
      prompt)
        exec 3>&1

-       if [ `yesno "Do you want to erase the downloaded files " y` = y ]; then
-          $APTGET clean && echo "Press enter to continue." && read RES && exit 0;
+       echo -n $"Do you want to erase any previously downloaded .deb files?"
+       if [ $(yesno "" y) = y ]; then
+          $APTGET "$APT_OPT0" "$APT_OPT1" clean &&
+           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 "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."
-   read RES && $DPKG --configure -a
+   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 $"Press enter to continue."
+   read RES && $DPKG "$DPKG_OPTS" --configure -a

    exit 100
 fi
 
    exit 100
 fi