From f2acd1998ba3ba81a2bc304c2812fd60a28b4dde Mon Sep 17 00:00:00 2001 From: njlr Date: Wed, 27 Feb 2019 13:47:54 +0000 Subject: [PATCH] * Reduces the size of the final bundle --- buckaroo-cli/buckaroo-cli.fsproj | 2 ++ buckaroo/Archive.fs | 6 +++--- buckaroo/Constants.fs | 2 +- buckaroo/buckaroo.fsproj | 1 - warp-bundle-linux.sh | 5 +++-- warp-bundle-macos.sh | 5 +++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/buckaroo-cli/buckaroo-cli.fsproj b/buckaroo-cli/buckaroo-cli.fsproj index 3032163..00c35ce 100644 --- a/buckaroo-cli/buckaroo-cli.fsproj +++ b/buckaroo-cli/buckaroo-cli.fsproj @@ -5,6 +5,8 @@ netcoreapp2.1 false true + false + false diff --git a/buckaroo/Archive.fs b/buckaroo/Archive.fs index 01d2094..366bb30 100644 --- a/buckaroo/Archive.fs +++ b/buckaroo/Archive.fs @@ -19,14 +19,14 @@ let private extractRoot (archive : IArchive) (pattern : string) = match candidates with | head::[] -> head | [] -> - raise <| new Exception("No directories matched the root") + raise <| Exception ("No directories matched the root") | xs -> - raise <| new Exception("Multiple directories match the root: " + (string xs)) + raise <| Exception ("Multiple directories match the root: " + (string xs)) let extractTo (pathToArchive : string) (pathToExtraction : string) (stripPrefix : string option) = async { use archive = Archives.Zip.ZipArchive.Open(pathToArchive) :> IArchive - let extractionOptions = new ExtractionOptions() + let extractionOptions = ExtractionOptions () extractionOptions.ExtractFullPath <- false extractionOptions.Overwrite <- true diff --git a/buckaroo/Constants.fs b/buckaroo/Constants.fs index c974796..7fc179d 100644 --- a/buckaroo/Constants.fs +++ b/buckaroo/Constants.fs @@ -1,7 +1,7 @@ module Buckaroo.Constants [] -let Version = "2.1.0" +let Version = "2.1.1" [] let PackagesDirectory = "buckaroo" diff --git a/buckaroo/buckaroo.fsproj b/buckaroo/buckaroo.fsproj index 180f80a..77d6f55 100644 --- a/buckaroo/buckaroo.fsproj +++ b/buckaroo/buckaroo.fsproj @@ -60,7 +60,6 @@ - diff --git a/warp-bundle-linux.sh b/warp-bundle-linux.sh index 4ce15fa..2031e15 100755 --- a/warp-bundle-linux.sh +++ b/warp-bundle-linux.sh @@ -2,14 +2,15 @@ export CppCompilerAndLinker=clang -wget -O warp-packer https://github.com/dgiagio/warp/releases/download/v0.3.0/linux-x64.warp-packer +wget -c -O warp-packer https://github.com/dgiagio/warp/releases/download/v0.3.0/linux-x64.warp-packer chmod +x ./warp-packer ./warp-packer --version -dotnet publish ./buckaroo-cli/ -c Release -r linux-x64 +dotnet publish ./buckaroo-cli/ -c Release -r linux-x64 mkdir -p warp +rm -rf ./warp/buckaroo-linux ./warp-packer --arch linux-x64 --exec buckaroo-cli --input_dir ./buckaroo-cli/bin/Release/netcoreapp2.1/linux-x64 --output warp/buckaroo-linux ./warp/buckaroo-linux diff --git a/warp-bundle-macos.sh b/warp-bundle-macos.sh index 1edd205..f694bf2 100755 --- a/warp-bundle-macos.sh +++ b/warp-bundle-macos.sh @@ -1,13 +1,14 @@ #!/bin/bash -wget -O warp-packer https://github.com/dgiagio/warp/releases/download/v0.3.0/macos-x64.warp-packer +wget -O warp-packer https://github.com/dgiagio/warp/releases/download/v0.3.0/macos-x64.warp-packer chmod +x ./warp-packer ./warp-packer --version -dotnet publish ./buckaroo-cli/ -c Release -r osx-x64 +dotnet publish ./buckaroo-cli/ -c Release -r osx-x64 mkdir -p warp +rm -rf ./warp/buckaroo-macos ./warp-packer --arch macos-x64 --exec buckaroo-cli --input_dir ./buckaroo-cli/bin/Release/netcoreapp2.1/osx-x64 --output warp/buckaroo-macos ./warp/buckaroo-macos