From b5b1491d209646e0099ff2d0cd3219771b579352 Mon Sep 17 00:00:00 2001 From: Jared Hester Date: Mon, 12 Dec 2016 15:11:10 -0500 Subject: [PATCH] back to magic mode --- .gitignore | 1 - .paket/{paket.bootstrapper.exe => paket.exe} | Bin ...ket.bootstrapper.exe.config => paket.exe.config} | 0 build.cmd | 4 ---- build.sh | 12 ------------ 5 files changed, 17 deletions(-) rename .paket/{paket.bootstrapper.exe => paket.exe} (100%) rename .paket/{paket.bootstrapper.exe.config => paket.exe.config} (100%) diff --git a/.gitignore b/.gitignore index c8c4fba1b5..3853c64a46 100644 --- a/.gitignore +++ b/.gitignore @@ -179,7 +179,6 @@ release.sh localpackages/ paket-files *.orig -.paket/paket.exe docs/content/license.md docs/content/release-notes.md _NCrunch_Paket diff --git a/.paket/paket.bootstrapper.exe b/.paket/paket.exe similarity index 100% rename from .paket/paket.bootstrapper.exe rename to .paket/paket.exe diff --git a/.paket/paket.bootstrapper.exe.config b/.paket/paket.exe.config similarity index 100% rename from .paket/paket.bootstrapper.exe.config rename to .paket/paket.exe.config diff --git a/build.cmd b/build.cmd index ef48c12ed4..cecc7647b0 100644 --- a/build.cmd +++ b/build.cmd @@ -1,8 +1,4 @@ @echo off -.paket\paket.bootstrapper.exe -if errorlevel 1 ( - exit /b %errorlevel% -) .paket\paket.exe restore if errorlevel 1 ( diff --git a/build.sh b/build.sh index 94b5a849d4..255151d023 100755 --- a/build.sh +++ b/build.sh @@ -2,12 +2,6 @@ if test "$OS" = "Windows_NT" then # use .Net - .paket/paket.bootstrapper.exe - exit_code=$? - if [ $exit_code -ne 0 ]; then - exit $exit_code - fi - .paket/paket.exe restore exit_code=$? if [ $exit_code -ne 0 ]; then @@ -16,12 +10,6 @@ then packages/build/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx else - mono .paket/paket.bootstrapper.exe - exit_code=$? - if [ $exit_code -ne 0 ]; then - exit $exit_code - fi - mono .paket/paket.exe restore exit_code=$? if [ $exit_code -ne 0 ]; then