Use --self-contained for Firmware

forki · Jun 28, 2019 · 958fd43 · 958fd43
1 parent 07bec93
commit 958fd43
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,7 +1,8 @@
 # Release Notes
 
-## 1.4.1 - 2019-06-27
+## 1.4.2 - 2019-06-28
 * Update deps
+* Use --self-contained for Firmware
 
 ## 1.3.1 - 2019-03-22
 * Show light

diff --git a/build.fsx b/build.fsx
@@ -155,7 +155,7 @@ Target.create "CreateFirmware" (fun _ ->
             { info with
                 FileName = dotnetOpts.DotNetCliPath
                 WorkingDirectory = piServerPath
-                Arguments = "publish -c Release -r linux-arm -o \"" + Path.getFullName publish + "\"" }) TimeSpan.MaxValue
+                Arguments = "publish -c Release -r linux-arm --self-contained -o \"" + Path.getFullName publish + "\"" }) TimeSpan.MaxValue
     if result <> 0 then failwith "Publish PiServer failed"
 
     [ piServerPath </> "PiServer"

diff --git a/src/PiServer/install.sh b/src/PiServer/install.sh
@@ -29,13 +29,6 @@ log_action_cont_msg " apt install "
 sudo apt-get install -y curl libunwind8 gettext apt-transport-https omxplayer npm unzip
 log_action_end_msg $?
 
-log_action_begin_msg "Download dotnet core "
-curl -sSL -o dotnet.tar.gz https://download.visualstudio.microsoft.com/download/pr/b12c61f5-7ba4-47f1-93f0-d2280fa4bf3c/8e1ae5ac780c61e0339d0247e7d9a8d8/dotnet-runtime-2.2.3-linux-arm.tar.gz
-sudo mkdir -p /opt/dotnet && sudo tar zxf dotnet.tar.gz -C /opt/dotnet
-rm dotnet.tar.gz
-sudo ln -s /opt/dotnet/dotnet /usr/local/bin
-log_action_end_msg $?
-
 if [ -e  $SCRIPTROOT/$PROJECTNAME ]; then
     if [ ! -e $DEFAULTS -a $SCRIPTROOT/$PROJECTNAME.defaults ]; then
         echo DAEMONHOME=$DAEMONHOME > $DEFAULTS

diff --git a/src/PiServer/update.sh b/src/PiServer/update.sh
@@ -30,13 +30,6 @@ if [ -e $DEFAULTS ]; then
             exit 2
         fi
 
-        log_action_begin_msg "Download dotnet core "
-        curl -sSL -o dotnet.tar.gz https://download.visualstudio.microsoft.com/download/pr/b12c61f5-7ba4-47f1-93f0-d2280fa4bf3c/8e1ae5ac780c61e0339d0247e7d9a8d8/dotnet-runtime-2.2.3-linux-arm.tar.gz
-        sudo mkdir -p /opt/dotnet && sudo tar zxf dotnet.tar.gz -C /opt/dotnet
-        rm dotnet.tar.gz
-        sudo ln -s /opt/dotnet/dotnet /usr/local/bin
-        log_action_end_msg $?
-
         log_action_begin_msg "Updating packages "
         log_action_cont_msg " apt update "
         apt-get -qq update