From c3edef14144ee5e3e73d4cbe35f4415be9d71b11 Mon Sep 17 00:00:00 2001 From: Jimmy Byrd Date: Mon, 12 Feb 2018 00:17:03 -0500 Subject: [PATCH] paket magic mode --- .gitignore | 3 +-- .paket/{paket.bootstrapper.exe => paket.exe} | Bin .paket/paket.exe.config | 5 +++-- Content/.gitignore | 1 - .../.paket/{paket.bootstrapper.exe => paket.exe} | Bin Content/.paket/paket.exe.config | 5 +++-- Content/build.cmd | 5 ----- Content/build.sh | 13 +++++-------- build.cmd | 5 ----- build.sh | 14 ++++---------- 10 files changed, 16 insertions(+), 35 deletions(-) rename .paket/{paket.bootstrapper.exe => paket.exe} (100%) rename Content/.paket/{paket.bootstrapper.exe => paket.exe} (100%) diff --git a/.gitignore b/.gitignore index 0fdeefd1..b13edf91 100644 --- a/.gitignore +++ b/.gitignore @@ -242,7 +242,6 @@ FakesAssemblies/ _Pvt_Extensions # Paket dependency manager -.paket/paket.exe paket-files/ # FAKE - F# Make @@ -254,4 +253,4 @@ paket-files/ TestResults.xml -dist/ \ No newline at end of file +dist/ 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.exe.config b/.paket/paket.exe.config index 2fc733f9..0235d479 100644 --- a/.paket/paket.exe.config +++ b/.paket/paket.exe.config @@ -1,6 +1,7 @@ - + + - \ No newline at end of file + diff --git a/Content/.gitignore b/Content/.gitignore index cf36e684..b13edf91 100644 --- a/Content/.gitignore +++ b/Content/.gitignore @@ -242,7 +242,6 @@ FakesAssemblies/ _Pvt_Extensions # Paket dependency manager -.paket/paket.exe paket-files/ # FAKE - F# Make diff --git a/Content/.paket/paket.bootstrapper.exe b/Content/.paket/paket.exe similarity index 100% rename from Content/.paket/paket.bootstrapper.exe rename to Content/.paket/paket.exe diff --git a/Content/.paket/paket.exe.config b/Content/.paket/paket.exe.config index 2fc733f9..0235d479 100644 --- a/Content/.paket/paket.exe.config +++ b/Content/.paket/paket.exe.config @@ -1,6 +1,7 @@ - + + - \ No newline at end of file + diff --git a/Content/build.cmd b/Content/build.cmd index 09b44ffb..b2a87f12 100644 --- a/Content/build.cmd +++ b/Content/build.cmd @@ -1,11 +1,6 @@ @echo off cls -.paket\paket.bootstrapper.exe -if errorlevel 1 ( - exit /b %errorlevel% -) - .paket\paket.exe restore if errorlevel 1 ( exit /b %errorlevel% diff --git a/Content/build.sh b/Content/build.sh index 6491c3a9..9b34c9f1 100755 --- a/Content/build.sh +++ b/Content/build.sh @@ -4,7 +4,6 @@ set -eu cd "$(dirname "$0")" -PAKET_BOOTSTRAPPER_EXE=.paket/paket.bootstrapper.exe PAKET_EXE=.paket/paket.exe FAKE_EXE=packages/build/FAKE/tools/FAKE.exe @@ -43,12 +42,12 @@ yesno() { } set +e -run $PAKET_BOOTSTRAPPER_EXE -bootstrapper_exitcode=$? +run $PAKET_EXE restore +exit_code=$? set -e if [ "$OS" != "Windows_NT" ] && - [ $bootstrapper_exitcode -ne 0 ] && + [ $exit_code -ne 0 ] && [ $(certmgr -list -c Trust | grep X.509 | wc -l) -le 1 ] && [ $(certmgr -list -c -m Trust | grep X.509 | wc -l) -le 1 ] then @@ -71,12 +70,10 @@ then fi # Re-run bootstrapper whether or not the user ran mozroots, because maybe # they fixed the problem in a separate terminal window. - run $PAKET_BOOTSTRAPPER_EXE + run $PAKET_EXE restore fi -run $PAKET_EXE restore -[ ! -e build.fsx ] && run $PAKET_EXE update -[ ! -e build.fsx ] && run $FAKE_EXE init.fsx + run $FAKE_EXE "$@" $FSIARGS $FSIARGS2 build.fsx diff --git a/build.cmd b/build.cmd index 8e54012b..397653b8 100644 --- a/build.cmd +++ b/build.cmd @@ -1,11 +1,6 @@ @echo off cls -.paket\paket.bootstrapper.exe -if errorlevel 1 ( - exit /b %errorlevel% -) - .paket\paket.exe restore if errorlevel 1 ( exit /b %errorlevel% diff --git a/build.sh b/build.sh index e6338c38..1470242b 100755 --- a/build.sh +++ b/build.sh @@ -4,7 +4,6 @@ set -eu cd "$(dirname "$0")" -PAKET_BOOTSTRAPPER_EXE=.paket/paket.bootstrapper.exe PAKET_EXE=.paket/paket.exe FAKE_EXE=packages/build/FAKE/tools/FAKE.exe @@ -44,12 +43,12 @@ yesno() { } set +e -run $PAKET_BOOTSTRAPPER_EXE -bootstrapper_exitcode=$? +run $PAKET_EXE restore +exit_code=$? set -e if [ "$OS" != "Windows_NT" ] && - [ $bootstrapper_exitcode -ne 0 ] && + [ $exit_code -ne 0 ] && [ $(certmgr -list -c Trust | grep X.509 | wc -l) -le 1 ] && [ $(certmgr -list -c -m Trust | grep X.509 | wc -l) -le 1 ] then @@ -72,14 +71,9 @@ then fi # Re-run bootstrapper whether or not the user ran mozroots, because maybe # they fixed the problem in a separate terminal window. - run $PAKET_BOOTSTRAPPER_EXE + run $PAKET_EXE restore fi -run $PAKET_EXE restore - -[ ! -e build.fsx ] && run $PAKET_EXE update -[ ! -e build.fsx ] && run $FAKE_EXE init.fsx - # build template pushd Content/ ./build.sh