Merge pull request #802 from cazfi/posixshebang

Replace #!/bin/bash with posix compliant shebang

Dockerfile

@@ -64,4 +64,4 @@ EXPOSE 80 8080 4002 6000 6001 6002 7000 7001 7002
 
 ENTRYPOINT ["/docker/docker-entrypoint.sh"]
 
-CMD ["/bin/bash"]
+CMD ["/usr/bin/env bash"]

config/gen-from-templates.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #   Copyright (C) 2018  The Freeciv-web project
 #

docker-entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 /docker/scripts/start-freeciv-web.sh
 

freeciv-web/build-js.sh

@@ -1,5 +1,6 @@
-#!/bin/bash
-# builds javascript files Freeciv-web and copies the resulting file to tomcat.
+#!/usr/bin/env bash
+
+# Builds javascript files Freeciv-web and copies the resulting file to tomcat.
 
 FCW_DEST=/var/lib/tomcat10/webapps/freeciv-web
 

freeciv-web/build.sh

@@ -1,5 +1,6 @@
-#!/bin/bash
-# builds Freeciv-web and copies the war file to Tomcat.
+#!/usr/bin/env bash
+
+# Builds Freeciv-web and copies the war file to Tomcat.
 
 BATCH_MODE=""
 

freeciv/apply_patches.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Freeciv server version upgrade notes (backports)
 # ------------------------------------------------

freeciv/dl_freeciv_default.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/usr/bin/env -S bash -e
 
 # Places the specified revision of Freeciv in freeciv/freeciv/
 # This is the default. The script dl_freeciv.sh will run instead of

freeciv/prepare_freeciv.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 cd "${DIR}"

pbem/restart.sh

@@ -1,5 +1,6 @@
-#!/bin/bash
-# nightly restart of PBEM process.
+#!/usr/bin/env bash
+
+# Nightly restart of PBEM process.
 
 kill $(ps -ef | grep python| grep pbem | awk '{print $2}')
 sleep 4

publite2/init-freeciv-web.sh

@@ -1,5 +1,6 @@
-#! /bin/bash
-# starts freeciv-proxy and freeciv-web.
+#!/usr/bin/env bash
+
+# Starts freeciv-proxy and freeciv-web.
 # This script is started by civlauncher.py in publite2.
 
 if [ "$#" -ne 6 ]; then

publite2/run.sh

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 nohup python3 -u publite2.py > ../logs/publite2.log 2>&1 || tail -5 ../logs/publite2.log && sleep 5  &

scripts/freeciv-img-extract/sync.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 resolve() { echo "$(cd "$1" >/dev/null && pwd)"; }
 while [[ $# -gt 0 ]]; do

scripts/helpdata_gen/ruleset_auto_gen.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Freeciv has code that generates certain help texts based on the ruleset.
 # This code is written in C. It is huge. Replicating it in JavaScript would

scripts/install/dependency-services-default-start.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Start Freeciv-web's dependency services.
 #

scripts/install/dependency-services-default-stop.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Shutdown Freeciv-web's dependency services.
 #

scripts/install/dependency-services-systemd-start.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Use systemd to start the services Freeciv-web depends on.
 # Need to start the dependency services in a different way to work with

scripts/install/dependency-services-systemd-stop.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Use systemd to stop the services Freeciv-web depends on.
 # Need to start the dependency services in a different way to work with

scripts/install/install.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #   Copyright (C) 2018  The Freeciv-web project
 #

scripts/log-cleanup.sh

@@ -1,5 +1,6 @@
-#!/bin/bash
-# cleans up logs
+#!/usr/bin/env bash
+
+# Cleans up logs
 
 find /home/freeciv/freeciv-web/freeciv-web/logs/*.log -exec cp /dev/null {} \;
 cp /dev/null /usr/local/nginx/logs/access.log

scripts/migration/0001-update-python-dependencies.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. >/dev/null && pwd)"
 

scripts/migration/0002-local-handlebars.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. >/dev/null && pwd)"
 

scripts/migration/migrate.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #   Copyright (C) 2018  The Freeciv-web project
 #

scripts/modpack-install/modpacks_install.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Install modpacks listed in freeciv/modpackURLs.lst
 

scripts/restart-tomcat.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export JAVA_OPTS="-Djava.security.egd=file:/dev/urandom"
 export CATALINA_HOME=/var/lib/tomcat10

scripts/start-freeciv-web.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 # Startup script for running all processes of Freeciv-web
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"

scripts/status-freeciv-web.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 # Checks status of various Freeciv-web processes
 
 alias curl='stdbuf -i0 -o0 -e0 curl'

scripts/stop-freeciv-web.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 # Shutdown script for Freeciv-web
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"

scripts/sync-js-hand.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # -Synchronizes the javascript packet handler (packhand_gen.js)
 #  with the definitions in packets.def.