test framework: Correctly generate new paths in noopchroot

[apt.git] / dselect / update

diff --git a/dselect/update b/dselect/update
index 66b942bcbaa50ec4d17cdc3b378ba5c4dbbf69b3..0ab317ee40654bd2f6d6bc59c21b2da47c8e4931 100755 (executable)
--- a/dselect/update
+++ b/dselect/update
@@ -1,9 +1,12 @@
-#!/bin/sh
+#!/bin/bash

 set -e
 
 set -e
 

+# Set the textdomain for the translations using $"..."
+TEXTDOMAIN="apt"
+

 # Get the configuration from /etc/apt/apt.conf
 CLEAN="prompt"
 # Get the configuration from /etc/apt/apt.conf
 CLEAN="prompt"

-OPTS="-f"
+OPTS=""

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


@@ -24,7 +27,7 @@ CACHEDIR=`echo $CACHEDIR | sed -e "s|/$||"`
 STATUS=1
 if $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" update
 then
 STATUS=1
 if $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" update
 then

-    echo "Merging Available information"
+    echo $"Merging available information"

     rm -f $CACHEDIR/available
     $APTCACHE dumpavail > $CACHEDIR/available
     $DPKG "$DPKG_OPTS" --update-avail $CACHEDIR/available
     rm -f $CACHEDIR/available
     $APTCACHE dumpavail > $CACHEDIR/available
     $DPKG "$DPKG_OPTS" --update-avail $CACHEDIR/available


@@ -39,7 +42,7 @@ then
 fi
 
 if [ x$PROMPT = "xtrue" ]; then
 fi
 
 if [ x$PROMPT = "xtrue" ]; then

-   echo "Press enter to continue." && read RES;
+   echo $"Press [Enter] to continue." && read RES;

 fi
 
 exit $STATUS
 fi
 
 exit $STATUS