mirror of
https://git.fsfe.org/FSFE/fsfe-local-build.git
synced 2026-04-21 03:43:05 +02:00
Compare commits
1 Commits
095ed704ce
...
feature/re
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2505f2be63 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,7 +5,6 @@ fsfe.org
|
||||
fsfe-website
|
||||
|
||||
lighttpd-fsfe*.log
|
||||
php-errors.log
|
||||
|
||||
# ignore everything in fsfe.org/ and status/ but keep the folders
|
||||
fsfe.org/*
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
#!/bin/bash
|
||||
# =============================================================================
|
||||
# Start a build of the fsfe-website checkout in the current working directory
|
||||
# =============================================================================
|
||||
# SPDX-FileCopyrightText: © 2020, 2021 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"
|
||||
case "$1" in
|
||||
--full|-f)
|
||||
"${gitdir}/build/build_main.sh" build_into "${builddir}/fsfe.org" --statusdir "${builddir}/status"
|
||||
;;
|
||||
*)
|
||||
"${gitdir}/build/build_main.sh" build_run "${builddir}/fsfe.org" --statusdir "${builddir}/status"
|
||||
;;
|
||||
esac
|
||||
@@ -130,11 +130,11 @@ for ((i=1; i <= $numargs; i++)); do
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# TEST if a DEV Git directory is used. If yes, copy clean file to this Dir
|
||||
# TEST if a DEV SVN directory is used. If yes, copy clean file to this Dir
|
||||
if [ "$LOC_trunk_dev" != "" ]; then
|
||||
SRC_full_dev=$(echo $SRC_full | sed -E "s|$LOC_trunk|$LOC_trunk_dev|")
|
||||
echo_INFO "A \"dirty\" Development Git directory ($LOC_trunk_dev) is being used. Copy file from clean Git directory ($LOC_trunk) to Development directory..."
|
||||
cp $SRC_full $SRC_full_dev # copy file from clean Git to dev/dirty Git
|
||||
echo_INFO "A \"dirty\" Development SVN directory ($LOC_trunk_dev) is being used. Copy file from clean SVN directory ($LOC_trunk) to Development directory..."
|
||||
cp $SRC_full $SRC_full_dev # copy file from clean SVN to dev/dirty SVN
|
||||
SRC_full=$SRC_full_dev
|
||||
LOC_trunk=$LOC_trunk_dev
|
||||
fi
|
||||
@@ -142,14 +142,7 @@ for ((i=1; i <= $numargs; i++)); do
|
||||
echo_INFO "Using file $SRC_full as source..."
|
||||
|
||||
### TRANSFORM XHTML file path
|
||||
DST_full=$(echo $SRC_full | sed -E "s|$LOC_trunk|$LOC_out|") # replace Git directory by build/HTTP destination
|
||||
|
||||
### Create destination directory if necessary
|
||||
DST_full_dir="$(dirname $DST_full)"
|
||||
if [ ! -e "$DST_full_dir" ]; then
|
||||
echo_INFO "Creating destination directory $DST_full_dir"
|
||||
mkdir -p "$DST_full_dir"
|
||||
fi
|
||||
DST_full=$(echo $SRC_full | sed -E "s|$LOC_trunk|$LOC_out|") # replace SVN directory by build/HTTP destination
|
||||
|
||||
### BUILD/COPY FILE depending on file extension
|
||||
ftype=${SRC_full##*.} # get extension of file
|
||||
@@ -180,7 +173,7 @@ for ((i=1; i <= $numargs; i++)); do
|
||||
echo_INFO "$HTTPD webserver already seems to be running."
|
||||
fi
|
||||
elif [ "$HTTPD" == "lighttpd" ]; then
|
||||
if [ ! $(pgrep -f "lighttpd.*${HTTPD_conf}") ]; then # lighttpd
|
||||
if [ ! $(pgrep lighttpd) ]; then # lighttpd
|
||||
echo_INFO "Starting $HTTPD webserver"
|
||||
/usr/sbin/lighttpd -f "$HTTPD_conf"
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user