X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e42eb508e01f4de6def088fe941344d3ca733fa5..2ff2a12a0967da0bcda4e45146f39826558ffb6c:/dselect/install

diff --git a/dselect/install b/dselect/install
index 6cf5dcf1a..75f0c0fc4 100755
--- a/dselect/install
+++ b/dselect/install
@@ -1,14 +1,23 @@
-#!/bin/sh
+#!/bin/bash
+
+# Set the textdomain for the translations using $"..."
+TEXTDOMAIN="apt"
 
 # 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
-RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::Options \
-                      DPKG Dir::Bin::dpkg/ APTGET Dir::Bin::apt-get/ \
-		      ARCHIVES Dir::Cache::Archives/`
+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
 set +e
 
@@ -19,15 +28,15 @@ yesno() {
 	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
-		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;;
@@ -38,8 +47,15 @@ yesno() {
 	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
@@ -49,35 +65,46 @@ fi
 # 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
+
+   NEWLS=$(ls -ld $ARCHIVES)
+   if [ "$CHECKDIR" = "true" ]; then
+      if [ "$OLDLS" = "$NEWLS" ]; then
+         exit 0
+      fi
+   fi
    
    # Check the cleaning mode
-   case `echo $CLEAN | tr '[:upper:]' '[:lower:]'` in
+   case $(echo $CLEAN | tr '[:upper:]' '[:lower:]') in
      auto)
-       $APTGET autoclean && echo "Press enter to continue." && read RES && exit 0;
+       $APTGET "$APT_OPT0" "$APT_OPT1" autoclean &&
+	   echo $"Press [Enter] to continue." && read RES && exit 0;
        ;;
      always)
-       $APTGET clean && echo "Press enter to continue." && read RES && exit 0;
+       $APTGET "$APT_OPT0" "$APT_OPT1" clean &&
+	   echo $"Press [Enter] to continue." && read RES && exit 0;
        ;;
      prompt)
        exec 3>&1
-       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;
+       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
-   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