Merge pull request freeciv#312 from kvilhaugsvik/build_system

More build system
rrsc · Jul 14, 2020 · 36dc40c · 36dc40c
2 parents 6aa0159 + 8fb76e4
commit 36dc40c
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/scripts/install/deb.sh b/scripts/install/deb.sh
@@ -67,7 +67,7 @@ if ! apt-cache -qq show openjdk-8-jdk-headless > /dev/null; then
   sudo ${APT_GET} update
 fi
 
-if apt-cache -qq show tomcat8 > /dev/null; then
+if apt-get --simulate install tomcat8 &> /dev/null; then
   dependencies="${dependencies} tomcat8 tomcat8-admin"
   INSTALLED_TOMCAT=Y
 else
@@ -78,9 +78,7 @@ if [ "${FCW_INSTALL_MODE}" = TEST ]; then
   dependencies="${dependencies} xauth xvfb phantomjs"
 fi
 
-echo "==== Installing Updates and Dependencies ===="
-echo "apt-get upgrade"
-sudo ${APT_GET} upgrade --with-new-pkgs
+echo "==== Installing Dependencies ===="
 echo "mysql setup..."
 sudo debconf-set-selections <<< "mysql-server mysql-server/root_password password ${DB_ROOT_PASSWORD}"
 sudo debconf-set-selections <<< "mysql-server mysql-server/root_password_again password ${DB_ROOT_PASSWORD}"