X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b381f6ed580f9c58c1547fddd92af1b52fc5a1f0..8683da61448b62df2ccc1918e4c605c9e6d4ab1d:/dselect/install?ds=inline diff --git a/dselect/install b/dselect/install index 2481fcea1..75f0c0fc4 100755 --- a/dselect/install +++ b/dselect/install @@ -1,13 +1,23 @@ -#!/bin/sh +#!/bin/bash + +# Set the textdomain for the translations using $"..." +TEXTDOMAIN="apt" # 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" +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` +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 @@ -18,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;; @@ -37,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 @@ -47,30 +64,47 @@ fi # Finished OK if [ $RES -eq 0 ]; then + + 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 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