0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00

Convert the barbarism in dist/automate.sh to proper BASH structure

When thy variables henceforth accept blessed white-space,
    guided will thy scripture be along righteous path(s).

    -- 4 BASH 3:42

Caddy's dist files sometimes ended up being owned by matt:staff or other
quite arcane and/or frightening names. If someone extracting didn't pay
attention a regular user who happened to have same uid by accident could
later tamper with the files' contents. It's 0:0 from now on.

Use all available threads when packaging distributables
Caddy binaries will be added to their archives in-place: This change
eliminates them being renamed within dist/builds one after another.
As does 'gox', dist/automate.sh will spare one available thread if possible.
This commit is contained in:
W-Mark Kubacki 2016-03-18 23:45:56 +01:00
parent ba2e9d80fd
commit 74a5cb2fe3
3 changed files with 69 additions and 46 deletions

1
.gitattributes vendored
View file

@ -1,4 +1,5 @@
*.bash text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=2 *.bash text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=2
*.sh text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=2
# files for systemd # files for systemd
*.path text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=2 *.path text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=2

View file

@ -9,9 +9,9 @@
# Outputs compiled program in current directory. # Outputs compiled program in current directory.
# Default file name is 'ecaddy'. # Default file name is 'ecaddy'.
set -e set -euo pipefail
: ${output_filename:="$1"} : ${output_filename:="${1:-}"}
: ${output_filename:="ecaddy"} : ${output_filename:="ecaddy"}
pkg=main pkg=main

110
dist/automate.sh vendored
View file

@ -1,56 +1,78 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e
set -o pipefail
shopt -s nullglob # if no files match glob, assume empty list instead of string literal
set -euo pipefail
# if no files match glob, assume empty list instead of string literal
shopt -s nullglob
## PACKAGE TO BUILD : ${build_package:="github.com/mholt/caddy"}
Package=github.com/mholt/caddy
: ${dist_dir:="${GOPATH}/src/${build_package}/dist"}
: ${build_dir:="${dist_dir}/builds"}
: ${target_dir:="${dist_dir}/release"}
## PATHS TO USE # Bundles a single binary, given as first parameter, into an archive.
DistDir=$GOPATH/src/$Package/dist package() {
BuildDir=$DistDir/builds # Binary inside the zip file is simply the project name
ReleaseDir=$DistDir/release binbase="$(basename "${build_package}")"
if [[ "${1}" == *.exe ]]; then
binbase+=".exe"
fi
bin="${build_dir}/${binbase}"
# Name .zip file same as binary, but strip .exe from end
zipname="$(basename "${1%.exe}")"
case "$(printf "${zipname}" | cut -d '_' -f 2 | sed -e 's:[a-z]*bsd:bsd:')" in
linux|bsd) zipname+=".tar.gz" ;;
*) zipname+=".zip" ;;
esac
## BEGIN # Compress distributable depending on extension
case "${zipname##*.}" in
zip)
zip -j "${target_dir}/${zipname}" \
"${1}" \
"${dist_dir}"/{CHANGES.txt,LICENSES.txt,README.txt}
printf "@ $(basename "${1}")\n@=${binbase}\n" \
| zipnote -w "${target_dir}/${zipname}"
;;
gz)
tar -caf "${target_dir}/${zipname}" \
--owner=0 --group=0 \
--transform="s#$(basename "${1}")#${binbase}#" \
-C "$(dirname "${1}")" "$(basename "${1}")" \
-C "${dist_dir}" CHANGES.txt LICENSES.txt README.txt
;;
esac
}
# Compile binaries prepare_directories() {
mkdir -p $BuildDir mkdir -p "${build_dir}"
cd $BuildDir rm -f "${build_dir}"/caddy*
rm -f caddy*
gox $Package
# Zip them up with release notes and stuff mkdir -p "${target_dir}"
mkdir -p $ReleaseDir rm -f "${target_dir}"/caddy*
cd $ReleaseDir }
rm -f caddy*
for f in $BuildDir/*
do
# Name .zip file same as binary, but strip .exe from end
zipname=$(basename ${f%".exe"})
if [[ $f == *"linux"* ]] || [[ $f == *"bsd"* ]]; then
zipname=${zipname}.tar.gz
else
zipname=${zipname}.zip
fi
# Binary inside the zip file is simply the project name compile_binaries() {
binbase=$(basename $Package) (cd "${build_dir}"; gox "${build_package}")
if [[ $f == *.exe ]]; then }
binbase=$binbase.exe
fi
bin=$BuildDir/$binbase
mv $f $bin
# Compress distributable if [[ "${1:-}" == "" ]]; then
if [[ $zipname == *.zip ]]; then prepare_directories
zip -j $zipname $bin $DistDir/CHANGES.txt $DistDir/LICENSES.txt $DistDir/README.txt compile_binaries
else
tar -cvzf $zipname -C $BuildDir $binbase -C $DistDir CHANGES.txt LICENSES.txt README.txt
fi
# Put binary filename back to original case "${OSTYPE}" in
mv $bin $f linux*)
done find "${build_dir}" -type f -executable -print0 \
| xargs --null --max-args=1 --max-procs=$(nproc --ignore=1) -I '{}' \
"${0}" package '{}'
;;
*)
while read f; do
package "${f}"
done < <(ls -1 "${build_dir}"/caddy*)
;;
esac
else
${1} "${2}"
fi