Commit d0310256 authored by Simon Brass's avatar Simon Brass
Browse files

fixup! bootstrap-whizard.sh: update LHAPDF and add bin option.

parent ae4a873a
Pipeline #5406 failed with stage
in 5 minutes and 44 seconds
......@@ -105,11 +105,11 @@ build_rivet () {
local url="${1}"
local name="$(basename ${url})"
local version="$(basename $(dirname ${url}))" && \
local dirname="rivet-${version}"
local dirname="rivet-${version}"
test -f ${name} || \
(wget --no-check-certificate --no-verbose "${url}" -O "${name}" && \
chmod u+x "${name}" && \
mkdir -p "${dirname}")
(wget --no-check-certificate --no-verbose "${url}" -O "${name}" && \
chmod u+x "${name}" && \
mkdir -p "${dirname}")
cd "${dirname}" && \
INSTALL_PREFIX="${PREFIX}" \
MAKE="make -j${NPROC} -s V=0" \
......@@ -306,9 +306,9 @@ function main() {
lhapdf)
CONFIG="${LHAPDF_CONFIG[@]}"
build_and_log "LHAPDF6" "${url_lhapdf}" "${CONFIG}" && \
# lhapdf install cteq6 cteq6l1 cteq66 CT10
wget https://lhapdf.hepforge.org/downloads?f=pdfsets/6.2/CT10.tar.gz -O- | tar xz -C ${PREFIX}/share/LHAPDF && \
wget https://lhapdf.hepforge.org/downloads?f=pdfsets/6.2/cteq6l1.tar.gz -O- | tar xz -C ${PREFIX}/share/LHAPDF
wget https://lhapdf.hepforge.org/downloads?f=pdfsets/6.2/CT10.tar.gz -O- | tar xz -C ${PREFIX}/share/LHAPDF && \
wget https://lhapdf.hepforge.org/downloads?f=pdfsets/6.2/cteq6l1.tar.gz -O- | tar xz -C ${PREFIX}/share/LHAPDF
# lhapdf install cteq6 cteq6l1 cteq66 CT10
;;
fastjet)
CONFIG="${FASTJET_CONFIG[@]}"
......@@ -328,11 +328,11 @@ function main() {
echo "${WHIZARD_CONFIG[@]}"
exit 0
;;
bin)
bin)
# Secure that the bin directory exists
mkdir -p "${PREFIX}/bin"
write_script ${PREFIX}/bin/whizard-build-env.sh
;;
mkdir -p "${PREFIX}/bin"
write_script ${PREFIX}/bin/whizard-build-env.sh
;;
help)
help
;;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment