From 4b8ebc82726e920f3f39d33d346247bee194c436 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Fri, 14 Jun 2019 18:16:47 -0500 Subject: [PATCH] fix start scripts on linux (dos2unix) fix permissions on linux (why were/are they carrying over from windows? ) --- Application/BuildScripts/PostPublish.bat | 10 ++++++++-- RunPublishPre.cmd | 2 -- RunPublishRelease.cmd | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Application/BuildScripts/PostPublish.bat b/Application/BuildScripts/PostPublish.bat index 22d06a63..d2135e73 100644 --- a/Application/BuildScripts/PostPublish.bat +++ b/Application/BuildScripts/PostPublish.bat @@ -111,5 +111,11 @@ echo making start scripts @(echo @echo off && echo @title IW4MAdmin && echo set DOTNET_CLI_TELEMETRY_OPTOUT=1 && echo dotnet Lib\IW4MAdmin.dll && echo pause) > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.cmd" @(echo @echo off && echo @title IW4MAdmin && echo set DOTNET_CLI_TELEMETRY_OPTOUT=1 && echo dotnet Lib\IW4MAdmin.dll && echo pause) > "%SolutionDir%Publish\Windows\StartIW4MAdmin.cmd" -@(echo #!/bin/bash && echo export DOTNET_CLI_TELEMETRY_OPTOUT=1 && echo dotnet Lib/IW4MAdmin.dll) > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.sh" -@(echo #!/bin/bash && echo export DOTNET_CLI_TELEMETRY_OPTOUT=1 && echo dotnet Lib/IW4MAdmin.dll) > "%SolutionDir%Publish\Windows\StartIW4MAdmin.sh" +@(echo #!/bin/bash&& echo export DOTNET_CLI_TELEMETRY_OPTOUT=1&& echo dotnet Lib/IW4MAdmin.dll) > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.sh" +dos2unix "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.sh" +@(echo #!/bin/bash&& echo export DOTNET_CLI_TELEMETRY_OPTOUT=1&& echo dotnet Lib/IW4MAdmin.dll) > "%SolutionDir%Publish\Windows\StartIW4MAdmin.sh" +dos2unix "%SolutionDir%Publish\Windows\StartIW4MAdmin.sh" + +echo setting permissions... +cacls "%SolutionDir%Publish\WindowsPrerelease" /t /e /p Everyone:F +cacls "%SolutionDir%Publish\Windows" /t /e /p Everyone:F \ No newline at end of file diff --git a/RunPublishPre.cmd b/RunPublishPre.cmd index 53476b30..f046f5a5 100644 --- a/RunPublishPre.cmd +++ b/RunPublishPre.cmd @@ -1,9 +1,7 @@ dotnet publish WebfrontCore/WebfrontCore.csproj -c Prerelease -o X:\IW4MAdmin\Publish\WindowsPrerelease /p:PublishProfile=Prerelease dotnet publish Application/Application.csproj -c Prerelease -o X:\IW4MAdmin\Publish\WindowsPrerelease /p:PublishProfile=Prerelease dotnet publish GameLogServer/GameLogServer.pyproj -c Release -o X:\IW4MAdmin\Publish\WindowsPrerelease\GameLogServer -::dotnet publish GameLogServer/DiscordWebhook.pyproj -c Release -o X:\IW4MAdmin\Publish\WindowsPrerelease\DiscordWebhook call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat" msbuild GameLogServer/GameLogServer.pyproj /p:PublishProfile=PreRelease /p:DeployOnBuild=true /p:PublishProfileRootFolder=X:\IW4MAdmin\GameLogServer\ -msbuild DiscordWebhook/DiscordWebhook.pyproj /p:PublishProfile=PreRelease /p:DeployOnBuild=true /p:PublishProfileRootFolder=X:\IW4MAdmin\DiscordWebhook\ cd "X:\IW4MAdmin\DEPLOY\" PowerShell ".\upload_prerelease.ps1" \ No newline at end of file diff --git a/RunPublishRelease.cmd b/RunPublishRelease.cmd index 35162f91..df02655d 100644 --- a/RunPublishRelease.cmd +++ b/RunPublishRelease.cmd @@ -3,6 +3,5 @@ dotnet publish Application/Application.csproj -c Release -o X:\IW4MAdmin\Publish dotnet publish GameLogServer/GameLogServer.pyproj -c Release -o X:\IW4MAdmin\Publish\Windows\GameLogServer call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat" msbuild GameLogServer/GameLogServer.pyproj /p:PublishProfile=Stable /p:DeployOnBuild=true /p:PublishProfileRootFolder=X:\IW4MAdmin\GameLogServer\ -msbuild DiscordWebhook/DiscordWebhook.pyproj /p:PublishProfile=Stable /p:DeployOnBuild=true /p:PublishProfileRootFolder=X:\IW4MAdmin\DiscordWebhook\ cd "X:\IW4MAdmin\DEPLOY\" PowerShell ".\upload_release.ps1" \ No newline at end of file