mxmehl/fsfe-local-build
1
0
Fork 0
mirror of https://git.fsfe.org/FSFE/fsfe-local-build.git synced 2026-04-20 11:23:06 +02:00
Code Issues Releases Wiki Activity

remove trailing slashes from config paths; fixing variable typo

Browse Source
This commit is contained in:
mxmehl
2016-11-29 11:35:06 +01:00
parent f0e2772ddd
commit 76a5a5bcd7
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fsfe-preview.sh
View File

@@ -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 if [ ! -e "$ROOT"/config.cfg ]; then echo "Missing config.cfg file. Edit and rename config.cfg.sample"; exit 1; fi
source "$ROOT"/config.cfg source "$ROOT"/config.cfg
# Help listing
if [ "$1" = "" ]; then if [ "$1" = "" ]; then
self=$(basename $0) self=$(basename $0)
echo "No parameters or variables given!" echo "No parameters or variables given!"
@@ -45,6 +46,12 @@ if [ "$1" = "" ]; then
exit 0 exit 0
fi 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 if [ "$1" = "--copy" ]; then
numargs=$(($# - 1)) numargs=$(($# - 1))
echo "[INFO] Starting a plain mass copy with $numargs files..." echo "[INFO] Starting a plain mass copy with $numargs files..."
@@ -105,7 +112,7 @@ fi
### START WEBSERVER if necessary ### START WEBSERVER if necessary
if [ ! $(pgrep lighttpd) ]; then if [ ! $(pgrep lighttpd) ]; then
echo "[INFO] Starting webserver" echo "[INFO] Starting webserver"
/usr/sbin/lighttpd -f $HTTPDST_conf /usr/sbin/lighttpd -f $HTTPD_conf
else else
echo "[INFO] Webserver already seems to be running." echo "[INFO] Webserver already seems to be running."
fi fi