diff options
Diffstat (limited to 'dselect')
| -rwxr-xr-x | dselect/install | 38 | ||||
| -rwxr-xr-x | dselect/update | 17 |
2 files changed, 33 insertions, 22 deletions
diff --git a/dselect/install b/dselect/install index 8ac3523bd..f93414dc4 100755 --- a/dselect/install +++ b/dselect/install @@ -5,11 +5,15 @@ CLEAN="prompt" 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/ \ - WAIT DSelect::WaitAfterDownload` + 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 @@ -39,14 +43,13 @@ yesno() { echo $ans | tr YN yn } -OLDLS=`ls -ld $ARCHIVES` -if [ x$WAIT = "xyes" ]; then - $APTGET $OPTS -d dselect-upgrade +if [ x$WAIT = "xtrue" ]; then + $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade echo "Press enter to continue." && read RES - $APTGET $OPTS dselect-upgrade + $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade RES=$? else - $APTGET $OPTS dselect-upgrade + $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade RES=$? fi @@ -64,22 +67,27 @@ if [ $RES -eq 0 ]; then fi NEWLS=`ls -ld $ARCHIVES` - if [ "x$OLDLS" = "x$NEWLS" ]; then - exit 0 + if [ x$CHECKDIR = "xtrue" ]; then + if [ "x$OLDLS" = "x$NEWLS" ]; then + exit 0 + fi fi # Check the cleaning mode 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; + if [ `yesno "Do you want to erase any previously downloaded .deb files?" y` = y ]; then + $APTGET "$APT_OPT0" "$APT_OPT1" clean && + echo "Press enter to continue." && read RES && exit 0; fi ;; *) @@ -91,7 +99,7 @@ else 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 + read RES && $DPKG "$DPKG_OPTS" --configure -a exit 100 fi diff --git a/dselect/update b/dselect/update index 9195912ea..a61086d79 100755 --- a/dselect/update +++ b/dselect/update @@ -6,12 +6,15 @@ OPTS="-f" APTGET="/usr/bin/apt-get" APTCACHE="/usr/bin/apt-cache" DPKG="/usr/bin/dpkg" +DPKG_OPTS="--admindir=$1" +APT_OPT0="-oDir::State::status=$1/status" +APT_OPT1="-oDPkg::Options::=$DPKG_OPTS" CACHEDIR="/var/cache/apt" -PROMPT="no" +PROMPT="false" RES=`apt-config shell OPTS DSelect::UpdateOptions \ - DPKG Dir::Bin::dpkg APTGET Dir::Bin::apt-get \ - APTCACHE Dir::Bin::apt-cache CACHEDIR Dir::Cache \ - PROMPT DSelect::PromptAfterUpdate` + DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \ + APTCACHE Dir::Bin::apt-cache/f CACHEDIR Dir::Cache/d \ + PROMPT DSelect::PromptAfterUpdate/b` eval $RES # It looks slightly ugly to have a double / in the dpkg output @@ -19,16 +22,16 @@ CACHEDIR=`echo $CACHEDIR | sed -e "s|/$||"` set +e FAILED=0 -$APTGET $OPTS update || FAILED=1 +$APTGET $OPTS "$APT_OPT0" "$APT_OPT1" update || FAILED=1 set -e echo "Merging Available information" rm -f $CACHEDIR/available $APTCACHE dumpavail > $CACHEDIR/available -$DPKG --update-avail $CACHEDIR/available +$DPKG "$DPKG_OPTS" --update-avail $CACHEDIR/available rm -f $CACHEDIR/available -if [ $PROMPT = "yes" ]; then +if [ x$PROMPT = "xtrue" ]; then echo "Press enter to continue." && read RES; fi |