mirror of
https://git.fsfe.org/FSFE/fsfe-local-build.git
synced 2026-07-23 11:59:15 +02:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2505f2be63 |
@@ -5,7 +5,6 @@ fsfe.org
|
|||||||
fsfe-website
|
fsfe-website
|
||||||
|
|
||||||
lighttpd-fsfe*.log
|
lighttpd-fsfe*.log
|
||||||
php-errors.log
|
|
||||||
|
|
||||||
# ignore everything in fsfe.org/ and status/ but keep the folders
|
# ignore everything in fsfe.org/ and status/ but keep the folders
|
||||||
fsfe.org/*
|
fsfe.org/*
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# =============================================================================
|
|
||||||
# Start a build of the fsfe-website checkout in the current working directory
|
|
||||||
# =============================================================================
|
|
||||||
# SPDX-FileCopyrightText: © 2020 Reinhard Müller <reinhard@fsfe.org>
|
|
||||||
# SPDX-License-Identifier: WTFPL
|
|
||||||
# =============================================================================
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Find out fsfe-website directory
|
|
||||||
gitdir="$(git rev-parse --show-toplevel)"
|
|
||||||
|
|
||||||
# Find out fsfe-local-build directory
|
|
||||||
builddir="$(dirname "$(readlink -f "$0")")"
|
|
||||||
|
|
||||||
# Start the build
|
|
||||||
echo "Building from ${gitdir} into ${builddir}/fsfe.org"
|
|
||||||
"${gitdir}/build/build_main.sh" build_run "${builddir}/fsfe.org" --statusdir "${builddir}/status"
|
|
||||||
+1
-1
@@ -173,7 +173,7 @@ for ((i=1; i <= $numargs; i++)); do
|
|||||||
echo_INFO "$HTTPD webserver already seems to be running."
|
echo_INFO "$HTTPD webserver already seems to be running."
|
||||||
fi
|
fi
|
||||||
elif [ "$HTTPD" == "lighttpd" ]; then
|
elif [ "$HTTPD" == "lighttpd" ]; then
|
||||||
if [ ! $(pgrep -f "lighttpd.*${HTTPD_conf}") ]; then # lighttpd
|
if [ ! $(pgrep lighttpd) ]; then # lighttpd
|
||||||
echo_INFO "Starting $HTTPD webserver"
|
echo_INFO "Starting $HTTPD webserver"
|
||||||
/usr/sbin/lighttpd -f "$HTTPD_conf"
|
/usr/sbin/lighttpd -f "$HTTPD_conf"
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user