setup-ubuntu.sh: ant is no longer used

diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
index 674319af50ca04641545a12ca11274510ceceae0..3545178045c99e503f53b028eb2c3ed52fa53b9e 100755 (executable)
--- a/scripts/setup-ubuntu.sh
+++ b/scripts/setup-ubuntu.sh
@@ -2,7 +2,6 @@
 set -e -u
 
 PACKAGES=""
 set -e -u
 
 PACKAGES=""

-PACKAGES+=" ant" # Used by apksigner.

 PACKAGES+=" asciidoc"
 PACKAGES+=" automake"
 PACKAGES+=" bison"
 PACKAGES+=" asciidoc"
 PACKAGES+=" automake"
 PACKAGES+=" bison"


@@ -38,7 +37,8 @@ PACKAGES+=" xutils-dev" # Provides 'makedepend' which the openssl build uses.
 PACKAGES+=" libexpat1-dev" # Needed by ghostscript
 PACKAGES+=" libjpeg-dev" # Needed by ghostscript
 
 PACKAGES+=" libexpat1-dev" # Needed by ghostscript
 PACKAGES+=" libjpeg-dev" # Needed by ghostscript
 

-DEBIAN_FRONTEND=noninteractive sudo apt-get install -yq --no-install-recommends $PACKAGES
+sudo DEBIAN_FRONTEND=noninteractive \
+       apt-get install -yq --no-install-recommends $PACKAGES

 
 sudo mkdir -p /data/data/com.termux/files/usr
 sudo chown -R `whoami` /data
 
 sudo mkdir -p /data/data/com.termux/files/usr
 sudo chown -R `whoami` /data