bea/docker-deluge-openvpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Standardize scripts, use bash and double brackets

Browse Source
This commit is contained in:
Kristian Haugene
2019-03-09 18:52:06 +01:00
parent 43abe72c2a
commit 66c7634f18
9 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
transmission/start.sh
View File

@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# Source our persisted env variables from container startup
. /etc/transmission/environment-variables.sh
@@ -6,7 +6,7 @@
# This script will be called with tun/tap device name as parameter 1, and local IP as parameter 4
# See https://openvpn.net/index.php/open-source/documentation/manuals/65-openvpn-20x-manpage.html (--up cmd)
echo "Up script executed with $*"
if [ "$4" = "" ]; then
if [[ "$4" = "" ]]; then
echo "ERROR, unable to obtain tunnel address"
echo "killing $PPID"
kill -9 $PPID
@@ -14,7 +14,7 @@ if [ "$4" = "" ]; then
fi
# If transmission-pre-start.sh exists, run it
if [ -x /scripts/transmission-pre-start.sh ]
if [[ -x /scripts/transmission-pre-start.sh ]]
then
echo "Executing /scripts/transmission-pre-start.sh"
/scripts/transmission-pre-start.sh "$@"
@@ -24,17 +24,17 @@ fi
echo "Updating TRANSMISSION_BIND_ADDRESS_IPV4 to the ip of $1 : $4"
export TRANSMISSION_BIND_ADDRESS_IPV4=$4
if [ "combustion" = "$TRANSMISSION_WEB_UI" ]; then
if [[ "combustion" = "$TRANSMISSION_WEB_UI" ]]; then
echo "Using Combustion UI, overriding TRANSMISSION_WEB_HOME"
export TRANSMISSION_WEB_HOME=/opt/transmission-ui/combustion-release
fi
if [ "kettu" = "$TRANSMISSION_WEB_UI" ]; then
if [[ "kettu" = "$TRANSMISSION_WEB_UI" ]]; then
echo "Using Kettu UI, overriding TRANSMISSION_WEB_HOME"
export TRANSMISSION_WEB_HOME=/opt/transmission-ui/kettu
fi
if [ "transmission-web-control" = "$TRANSMISSION_WEB_UI" ]; then
if [[ "transmission-web-control" = "$TRANSMISSION_WEB_UI" ]]; then
echo "Using Transmission Web Control UI, overriding TRANSMISSION_WEB_HOME"
export TRANSMISSION_WEB_HOME=/opt/transmission-ui/transmission-web-control
fi
@@ -47,7 +47,7 @@ dockerize -template /etc/transmission/settings.tmpl:${TRANSMISSION_HOME}/setting
echo "sed'ing True to true"
sed -i 's/True/true/g' ${TRANSMISSION_HOME}/settings.json
if [ ! -e "/dev/random" ]; then
if [[ ! -e "/dev/random" ]]; then
# Avoid "Fatal: no entropy gathering module detected" error
echo "INFO: /dev/random not found - symlink to /dev/urandom"
ln -s /dev/urandom /dev/random
@@ -55,7 +55,7 @@ fi
. /etc/transmission/userSetup.sh
if [ "true" = "$DROP_DEFAULT_ROUTE" ]; then
if [[ "true" = "$DROP_DEFAULT_ROUTE" ]]; then
echo "DROPPING DEFAULT ROUTE"
ip r del default || exit 1
fi
@@ -63,11 +63,11 @@ fi
echo "STARTING TRANSMISSION"
exec su --preserve-environment ${RUN_AS} -s /bin/bash -c "/usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} --logfile ${TRANSMISSION_HOME}/transmission.log" &
if [ "$OPENVPN_PROVIDER" = "PIA" ]
if [[ "$OPENVPN_PROVIDER" = "PIA" ]]
then
echo "CONFIGURING PORT FORWARDING"
exec /etc/transmission/updatePort.sh &
elif [ "$OPENVPN_PROVIDER" = "PERFECTPRIVACY" ]
elif [[ "$OPENVPN_PROVIDER" = "PERFECTPRIVACY" ]]
then
echo "CONFIGURING PORT FORWARDING"
exec /etc/transmission/updatePPPort.sh ${TRANSMISSION_BIND_ADDRESS_IPV4} &
@@ -76,7 +76,7 @@ else
fi
# If transmission-post-start.sh exists, run it
if [ -x /scripts/transmission-post-start.sh ]
if [[ -x /scripts/transmission-post-start.sh ]]
then
echo "Executing /scripts/transmission-post-start.sh"
/scripts/transmission-post-start.sh "$@"