Fixed to new security and non-us urls

[apt.git] / dselect / update

diff --git a/dselect/update b/dselect/update
index ca507c4c670403bbcbc080016edf5164e6ea2ea3..904648428191ce1e718d38a82059faba5c00b431 100755 (executable)
--- a/dselect/update
+++ b/dselect/update
@@ -7,16 +7,29 @@ APTGET="/usr/bin/apt-get"
 APTCACHE="/usr/bin/apt-cache"
 DPKG="/usr/bin/dpkg"
 CACHEDIR="/var/cache/apt"
 APTCACHE="/usr/bin/apt-cache"
 DPKG="/usr/bin/dpkg"
 CACHEDIR="/var/cache/apt"

+PROMPT="no"

 RES=`apt-config shell OPTS DSelect::UpdateOptions \
       DPKG Dir::Bin::dpkg APTGET Dir::Bin::apt-get \
 RES=`apt-config shell OPTS DSelect::UpdateOptions \
       DPKG Dir::Bin::dpkg APTGET Dir::Bin::apt-get \

-      APTCACHE Dir::Bin::apt-cache CACHEDIR Dir::Cache`
+      APTCACHE Dir::Bin::apt-cache CACHEDIR Dir::Cache \
+      PROMPT DSelect::PromptAfterUpdate`

 eval $RES
 
 eval $RES
 

-$APTGET $OPTS update
+# It looks slightly ugly to have a double / in the dpkg output
+CACHEDIR=`echo $CACHEDIR | sed -e "s|/$||"`
+
+set +e
+FAILED=0
+$APTGET $OPTS update || FAILED=1
+set -e

 
 echo "Merging Available information"
 rm -f /var/cache/apt/available
 $APTCACHE dumpavail > $CACHEDIR/available
 $DPKG --update-avail $CACHEDIR/available
 rm -f $CACHEDIR/available
 
 echo "Merging Available information"
 rm -f /var/cache/apt/available
 $APTCACHE dumpavail > $CACHEDIR/available
 $DPKG --update-avail $CACHEDIR/available
 rm -f $CACHEDIR/available

-exit 0
+
+if [ $PROMPT = "yes" ]; then
+   echo "Press enter to continue." && read RES;
+fi
+
+exit $FAILED