paket magic mode

TheAngryByrd · Feb 12, 2018 · c3edef1 · c3edef1
1 parent c61771c
commit c3edef1
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 35 deletions.
diff --git 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/
+dist/
diff --git a/.paket/paket.bootstrapper.exe → .paket/paket.exe b/.paket/paket.bootstrapper.exe → .paket/paket.exe
diff --git a/.paket/paket.exe.config b/.paket/paket.exe.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <appSettings>
-    <add key="Prerelease" value="True"/>
+    <add key="Prerelease" value="False"/>
+    <!-- <add key="PaketVersion" value="5.122.0"/> -->
   </appSettings>
-</configuration>
+</configuration>
diff --git 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 → Content/.paket/paket.exe b/Content/.paket/paket.bootstrapper.exe → Content/.paket/paket.exe
diff --git a/Content/.paket/paket.exe.config b/Content/.paket/paket.exe.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <appSettings>
-    <add key="Prerelease" value="True"/>
+    <add key="Prerelease" value="False"/>
+    <!-- <add key="PaketVersion" value="5.122.0"/> -->
   </appSettings>
-</configuration>
+</configuration>
diff --git 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
@@ -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
@@ -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
@@ -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