MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1251 from harshavardhana/release-fixes 

release: gz doesn't preserve permissions use tar.gz
This commit is contained in:
Harshavardhana 2016-03-30 14:34:19 -07:00
parent 956142be37 59ee5a547c
commit a84c466a40
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -73,7 +73,7 @@ getdeps: checks
@go get -u github.com/remyoudompheng/go-misc/deadcode && echo "Installed deadcode:" @go get -u github.com/remyoudompheng/go-misc/deadcode && echo "Installed deadcode:"
@go get -u github.com/client9/misspell/cmd/misspell && echo "Installed misspell:" @go get -u github.com/client9/misspell/cmd/misspell && echo "Installed misspell:"
verifiers: getdeps vet fmt lint cyclo spelling verifiers: vet fmt lint cyclo spelling
vet: vet:
@echo "Running $@:" @echo "Running $@:"
@ -137,7 +137,7 @@ pkg-list:
install: gomake-all install: gomake-all
dockerimage: checkdocker verifiers $(UI_ASSETS) dockerimage: checkdocker getdeps verifiers $(UI_ASSETS)
@echo "Building docker image:" minio:$(TAG) @echo "Building docker image:" minio:$(TAG)
@GO15VENDOREXPERIMENT=1 GOOS=linux GOARCH=amd64 go build --ldflags $(DOCKER_LDFLAGS) -o docker/minio.dockerimage @GO15VENDOREXPERIMENT=1 GOOS=linux GOARCH=amd64 go build --ldflags $(DOCKER_LDFLAGS) -o docker/minio.dockerimage
@cd docker; mkdir -p export; sudo docker build --rm --tag=minio/minio:$(TAG) . @cd docker; mkdir -p export; sudo docker build --rm --tag=minio/minio:$(TAG) .

35
buildscripts/build.sh
View File

@ -26,10 +26,12 @@ _init() {
SUPPORTED_OSARCH='linux/386 linux/amd64 linux/arm windows/386 windows/amd64 darwin/amd64' SUPPORTED_OSARCH='linux/386 linux/amd64 linux/arm windows/386 windows/amd64 darwin/amd64'
## System binaries ## System binaries
CP="/bin/cp" CP=`which cp`
SHASUM="/usr/bin/shasum" SHASUM=`which shasum`
GZIP="/usr/bin/gzip" GZIP=`which gzip`
ZIP="/usr/bin/zip" ZIP=`which zip`
SED=`which sed`
TAR=`which tar`
} }
go_build() { go_build() {
@ -47,25 +49,36 @@ go_build() {
# Release shasum name # Release shasum name
release_shasum="$release_str/$os-$arch/$(basename $package).shasum" release_shasum="$release_str/$os-$arch/$(basename $package).shasum"
# Release zip file. # Release zip file.
release_real_zip="$release_str/$os-$arch/$(basename $package).zip" release_real_zip="$(basename $package).zip"
release_real_gz="$release_str/$os-$arch/$(basename $package).gz" release_real_tgz="$(basename $package).tgz"
# Go build to build the binary. # Go build to build the binary.
GOOS=$os GOARCH=$arch go build --ldflags "${LDFLAGS}" -o $release_bin GOOS=$os GOARCH=$arch go build --ldflags "${LDFLAGS}" -o $release_bin
# Create copy # Create copy
$CP -p $release_bin $release_real_bin if [ $os == "windows" ]; then
$CP -p $release_bin ${release_real_bin}.exe
else
$CP -p $release_bin $release_real_bin
fi
# Calculate shasum # Calculate shasum
$SHASUM $release_bin > $release_shasum shasum_str=$(${SHASUM} ${release_bin})
echo ${shasum_str} | $SED "s/$release_str\/$os-$arch\///g" > $release_shasum
# Create a compressed file. # Create a compressed file.
if [ $os == "windows" ]; then if [ $os == "windows" ]; then
$ZIP -r $release_real_zip $release_real_bin cd "$release_str/$os-$arch"
$ZIP -r $release_real_zip $(basename $package).exe
cd -
elif [ $os == "darwin" ]; then elif [ $os == "darwin" ]; then
$ZIP -r $release_real_zip $release_real_bin cd "$release_str/$os-$arch"
$ZIP -r $release_real_zip $(basename $package)
cd -
elif [ $os == "linux" ]; then elif [ $os == "linux" ]; then
$GZIP -c $release_real_bin > $release_real_gz cd "$release_str/$os-$arch"
$TAR -czf $release_real_tgz $(basename $package)
cd -
else else
echo "$os operating system is not supported." echo "$os operating system is not supported."
exit 1 exit 1

2
update-main.go
View File

@ -148,7 +148,7 @@ func getReleaseUpdate(updateURL string, noError bool) updateMessage {
downloadURL = newUpdateURLPrefix + "/minio.zip" downloadURL = newUpdateURLPrefix + "/minio.zip"
default: default:
// For all other operating systems. // For all other operating systems.
downloadURL = newUpdateURLPrefix + "/minio.gz" downloadURL = newUpdateURLPrefix + "/minio.tgz"
} }
// Initialize update message. // Initialize update message.