mirror of
https://git.fsfe.org/FSFE/fsfe-local-build.git
synced 2026-04-18 10:23:05 +02:00
remove trailing slashes from config paths; fixing variable typo
This commit is contained in:
@@ -29,6 +29,7 @@ ROOT=$(dirname "$(readlink -f "$0")")
|
||||
if [ ! -e "$ROOT"/config.cfg ]; then echo "Missing config.cfg file. Edit and rename config.cfg.sample"; exit 1; fi
|
||||
source "$ROOT"/config.cfg
|
||||
|
||||
# Help listing
|
||||
if [ "$1" = "" ]; then
|
||||
self=$(basename $0)
|
||||
echo "No parameters or variables given!"
|
||||
@@ -45,6 +46,12 @@ if [ "$1" = "" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Remove trailing slashes
|
||||
LOC_trunk=$(echo $LOC_trunk | sed 's|/$||')
|
||||
LOC_out=$(echo $LOC_out | sed 's|/$||')
|
||||
LOC_trunk_dev=$(echo $LOC_trunk_dev | sed 's|/$||')
|
||||
|
||||
# Pure copy
|
||||
if [ "$1" = "--copy" ]; then
|
||||
numargs=$(($# - 1))
|
||||
echo "[INFO] Starting a plain mass copy with $numargs files..."
|
||||
@@ -105,7 +112,7 @@ fi
|
||||
### START WEBSERVER if necessary
|
||||
if [ ! $(pgrep lighttpd) ]; then
|
||||
echo "[INFO] Starting webserver"
|
||||
/usr/sbin/lighttpd -f $HTTPDST_conf
|
||||
/usr/sbin/lighttpd -f $HTTPD_conf
|
||||
else
|
||||
echo "[INFO] Webserver already seems to be running."
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user