summaryrefslogtreecommitdiff
path: root/dselect
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2015-08-14 10:50:56 +0200
committerJulian Andres Klode <jak@debian.org>2015-08-14 10:50:56 +0200
commit51c4e07f4cba0615ff269b5a8d04dfd3d1313b00 (patch)
tree40ce3c71671144c3d367d42c06a7dfa91eb8dc5e /dselect
parentdd14b7a562c54bb9ce551da1f8a80c78da5a4b6e (diff)
parent14c50b58e938cf78ce2d32d4ec39979f7575c543 (diff)
Merge branch 'debian/experimental' of https://github.com/DonKult/apt into debian/experimental
Diffstat (limited to 'dselect')
-rwxr-xr-xdselect/install12
-rwxr-xr-xdselect/update2
2 files changed, 7 insertions, 7 deletions
diff --git a/dselect/install b/dselect/install
index 7104ee280..75f0c0fc4 100755
--- a/dselect/install
+++ b/dselect/install
@@ -49,7 +49,7 @@ yesno() {
if [ "$WAIT" = "true" ]; then
$APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade
- echo $"Press enter to continue." && read RES
+ echo $"Press [Enter] to continue." && read RES
$APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade
RES=$?
else
@@ -65,7 +65,7 @@ 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
@@ -81,18 +81,18 @@ if [ $RES -eq 0 ]; then
case $(echo $CLEAN | tr '[:upper:]' '[:lower:]') in
auto)
$APTGET "$APT_OPT0" "$APT_OPT1" autoclean &&
- echo $"Press enter to continue." && read RES && exit 0;
+ echo $"Press [Enter] to continue." && read RES && exit 0;
;;
always)
$APTGET "$APT_OPT0" "$APT_OPT1" clean &&
- echo $"Press enter to continue." && read RES && exit 0;
+ echo $"Press [Enter] to continue." && read RES && exit 0;
;;
prompt)
exec 3>&1
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;
+ echo $"Press [Enter] to continue." && read RES && exit 0;
fi
;;
*)
@@ -103,7 +103,7 @@ else
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."
+ echo $"Press [Enter] to continue."
read RES && $DPKG "$DPKG_OPTS" --configure -a
exit 100
fi
diff --git a/dselect/update b/dselect/update
index 487fbf226..0ab317ee4 100755
--- a/dselect/update
+++ b/dselect/update
@@ -42,7 +42,7 @@ then
fi
if [ x$PROMPT = "xtrue" ]; then
- echo $"Press enter to continue." && read RES;
+ echo $"Press [Enter] to continue." && read RES;
fi
exit $STATUS