Browse Source

replace backticks with POSIX $() (Closes: #577116)

And again thanks to Jari Aalto for spotting & patching!
tags/debian/0.8.0
David Kalnischkies 11 years ago
parent
commit
cb658c4eea
2 changed files with 7 additions and 6 deletions
  1. +1
    -0
      debian/changelog
  2. +6
    -6
      dselect/install

+ 1
- 0
debian/changelog View File

@@ -29,6 +29,7 @@ apt (0.7.26~exp4) experimental; urgency=low
in the broken packages message. (Closes: #577168)
* dselect/install:
- modernize if-statements not to use 'x' (Closes: #577117)
- replace backticks with POSIX $() (Closes: #577116)

-- David Kalnischkies <kalnischkies@gmail.com> Sat, 03 Apr 2010 14:58:39 +0200



+ 6
- 6
dselect/install View File

@@ -12,11 +12,11 @@ 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 \
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`
CHECKDIR DSelect::CheckDir/b)
eval $RES
set +e

@@ -64,12 +64,12 @@ fi
# Finished OK
if [ $RES -eq 0 ]; then

if [ `ls $ARCHIVES $ARCHIVES/partial | egrep -v "^lock$|^partial$" | wc -l` \
if [ $(ls $ARCHIVES $ARCHIVES/partial | egrep -v "^lock$|^partial$" | wc -l) \
-eq 0 ]; then
exit 0
fi

NEWLS=`ls -ld $ARCHIVES`
NEWLS=$(ls -ld $ARCHIVES)
if [ "$CHECKDIR" = "true" ]; then
if [ "$OLDLS" = "$NEWLS" ]; then
exit 0
@@ -77,7 +77,7 @@ if [ $RES -eq 0 ]; then
fi
# Check the cleaning mode
case `echo $CLEAN | tr '[:upper:]' '[:lower:]'` in
case $(echo $CLEAN | tr '[:upper:]' '[:lower:]') in
auto)
$APTGET "$APT_OPT0" "$APT_OPT1" autoclean &&
echo $"Press enter to continue." && read RES && exit 0;
@@ -89,7 +89,7 @@ if [ $RES -eq 0 ]; then
prompt)
exec 3>&1
echo -n $"Do you want to erase any previously downloaded .deb files?"
if [ `yesno "" y` = y ]; then
if [ $(yesno "" y) = y ]; then
$APTGET "$APT_OPT0" "$APT_OPT1" clean &&
echo $"Press enter to continue." && read RES && exit 0;
fi


Loading…
Cancel
Save