Commit 3f49b320 authored by Matthew Holt's avatar Matthew Holt

Revert undesired changes to shell scripts

parent 0aacaea9
*.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
*.bash text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=4
*.sh text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=4
# files for systemd
*.path text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=2
*.service text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=2
*.timer 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=4
*.service text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=4
*.timer text eol=lf whitespace=blank-at-eol,space-before-tab,tab-in-indent,trailing-space,tabwidth=4
......@@ -19,7 +19,7 @@ ldflags=()
# Timestamp of build
name="${pkg}.buildDate"
value=$(date --utc +"%F %H:%M:%SZ")
value=$(date -u +"%a %b %d %H:%M:%S %Z %Y")
ldflags+=("-X" "\"${name}=${value}\"")
# Current tag, if HEAD is on a tag
......@@ -46,10 +46,7 @@ ldflags+=("-X" "\"${name}=${value}\"")
# List of modified files
name="${pkg}.gitFilesModified"
value="$(git diff-index --name-only HEAD | tr "\n" "," | sed -e 's:,$::')"
value="$(git diff-index --name-only HEAD)"
ldflags+=("-X" "\"${name}=${value}\"")
set -x
go build \
-ldflags "${ldflags[*]}" \
-o "${output_filename}"
go build -ldflags "${ldflags[*]}" -o "${output_filename}"
#!/usr/bin/env bash
set -euo pipefail
# if no files match glob, assume empty list instead of string literal
shopt -s nullglob
: ${build_package:="github.com/mholt/caddy"}
: ${dist_dir:="${GOPATH}/src/${build_package}/dist"}
: ${build_dir:="${dist_dir}/builds"}
: ${target_dir:="${dist_dir}/release"}
# Bundles a single binary, given as first parameter, into an archive.
package() {
# Binary inside the zip file is simply the project name
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
# 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
}
prepare_directories() {
mkdir -p "${build_dir}"
rm -f "${build_dir}"/caddy*
mkdir -p "${target_dir}"
rm -f "${target_dir}"/caddy*
}
compile_binaries() {
(cd "${build_dir}"; gox "${build_package}")
}
if [[ "${1:-}" == "" ]]; then
prepare_directories
compile_binaries
case "${OSTYPE}" in
linux*)
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
set -e
set -o pipefail
shopt -s nullglob # if no files match glob, assume empty list instead of string literal
## PACKAGE TO BUILD
Package=github.com/mholt/caddy
## PATHS TO USE
DistDir=$GOPATH/src/$Package/dist
BuildDir=$DistDir/builds
ReleaseDir=$DistDir/release
## BEGIN
# Compile binaries
mkdir -p $BuildDir
cd $BuildDir
rm -f caddy*
gox $Package
# Zip them up with release notes and stuff
mkdir -p $ReleaseDir
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
binbase=$(basename $Package)
if [[ $f == *.exe ]]; then
binbase=$binbase.exe
fi
bin=$BuildDir/$binbase
mv $f $bin
# Compress distributable
if [[ $zipname == *.zip ]]; then
zip -j $zipname $bin $DistDir/CHANGES.txt $DistDir/LICENSES.txt $DistDir/README.txt
else
tar -cvzf $zipname -C $BuildDir $binbase -C $DistDir CHANGES.txt LICENSES.txt README.txt
fi
# Put binary filename back to original
mv $bin $f
done
Markdown is supported
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