Remove version from bundle path
@@ -190,20 +190,18 @@ bundle() {
}
main() {
- # We want this to fail if the bundles already exist and cannot be removed.
- # This is to avoid mixing bundles from different versions of the code.
- mkdir -p bundles
- if [ -e "bundles/$VERSION" ] && [ -z "$KEEPBUNDLE" ]; then
- echo "bundles/$VERSION already exists. Removing."
- rm -fr "bundles/$VERSION" && mkdir "bundles/$VERSION" || exit 1
+ if [ -z "${KEEPBUNDLE-}" ]; then
+ echo "Removing bundles/"
+ rm -rf "bundles/*"
echo
fi
+ mkdir -p bundles
- if [ "$(go env GOHOSTOS)" != 'windows' ]; then
# Windows and symlinks don't get along well
-
+ if [ "$(go env GOHOSTOS)" != 'windows' ]; then
rm -f bundles/latest
- ln -s "$VERSION" bundles/latest
+ # preserve latest symlink for backward compatibility
+ ln -sf . bundles/latest
fi
if [ $# -lt 1 ]; then
@@ -212,7 +210,7 @@ main() {
bundles=($@)
fi
for bundle in ${bundles[@]}; do
- export DEST="bundles/$VERSION/$(basename "$bundle")"
+ export DEST="bundles/$(basename "$bundle")"
# Cygdrive paths don't play well with go build -o.
if [[ "$(uname -s)" == CYGWIN* ]]; then
export DEST="$(cygpath -mw "$DEST")"
