Remove unused autodeploy.sh

* Removed as it is no longer used, and redundant
* Moved some behavior to `install.sh`
* Other behavior moved to `prepare_freeciv.sh`

freeciv/prepare_freeciv.sh

@@ -1,9 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 
-if test "x$(dirname $0)" != "x." ; then
-  echo "Currently this script must be run on its own directory" >&2
-  exit 1
-fi
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
+
+cd "${DIR}"
+
+# Fix line endings on Windows
+sed -i 's/\r$//' freeciv-web.project
 
 . ./version.txt
 

scripts/README.md

@@ -18,5 +18,3 @@ Freeciv-web scripts
 * status-freeciv-web.sh - checks if Freeciv-web is running.
 
 * update-wikipedia-docs.py - generates docs from wikipedia about techs, units and buildings.
-
-* autodeploy.sh - script to build Freeciv-web nightly for a live server.

scripts/install/install.sh

@@ -290,11 +290,10 @@ setfacl -Rm d:u:tomcat8:rwX webapps/data
 
 echo "==== Building freeciv ===="
 echo "Please be patient"
-# Fix line endings on Windows
-sed -i 's/\r$//' "${basedir}"/freeciv/freeciv-web.project
-
-cd "${basedir}"/freeciv && ./prepare_freeciv.sh
-cd freeciv && make install
+cd "${basedir}"/freeciv && \
+  ./prepare_freeciv.sh  && \
+  cd freeciv && make install || \
+  handle_error 5 "Failed to install freeciv"
 
 echo "==== Building freeciv-web ===="
 if [ ! -f "${basedir}"/publite2/settings.ini ]; then