diff --git a/.editorconfig b/.editorconfig index 6cfb4760..4db563b4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,6 +6,10 @@ root=true # All files [*] indent_style = space +# shell files +[*.{cmd,sh,bat}] +insert_final_newline = true +trim_trailing_whitespace = true # Code files [*.{cs,csx,vb,vbx}] indent_size = 4 diff --git a/BootstrapAdmin.sln b/BootstrapAdmin.sln index 637d32d9..11a708d1 100644 --- a/BootstrapAdmin.sln +++ b/BootstrapAdmin.sln @@ -96,6 +96,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "win", "win", "{C6F2DCA0-794 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "linux", "linux", "{FDCFC3E3-14CF-40B2-9FE5-5BC239AAC110}" ProjectSection(SolutionItems) = preProject + deploy-admin.sh = deploy-admin.sh + deploy-client.sh = deploy-client.sh publish-admin.sh = publish-admin.sh publish-client.sh = publish-client.sh watch-run-admin.sh = watch-run-admin.sh diff --git a/Directory.Build.props b/Directory.Build.props index d54c233a..5a6cc485 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,5 @@  + Longbow Argo Zhang(argo@163.com) @@ -11,9 +12,9 @@ - - + + diff --git a/deploy-admin.sh b/deploy-admin.sh new file mode 100644 index 00000000..746df40a --- /dev/null +++ b/deploy-admin.sh @@ -0,0 +1,11 @@ +#! /bin/bash + +cd ~/BootstrapAdmin +git pull +dotnet publish src/admin/Bootstrap.Admin -c Release + +rm -f ~/BootstrapAdmin/src/admin/Bootstrap.Admin/bin/Release/netcoreapp2.2/publish/appsettings*.json +systemctl stop ba.admin +\cp -fr ~/BootstrapAdmin/src/admin/Bootstrap.Admin/bin/Release/netcoreapp2.2/publish/* /usr/local/ba/admin/ +systemctl start ba.admin +systemctl status ba.admin -l diff --git a/deploy-client.sh b/deploy-client.sh new file mode 100644 index 00000000..8c6ea577 --- /dev/null +++ b/deploy-client.sh @@ -0,0 +1,11 @@ +#! /bin/bash + +cd ~/BootstrapAdmin +git pull +dotnet publish src/client/Bootstrap.Client -c Release + +rm -f ~/BootstrapAdmin/src/client/Bootstrap.Client/bin/Release/netcoreapp2.2/publish/appsettings*.json +systemctl stop ba.client +\cp -fr ~/BootstrapAdmin/src/client/Bootstrap.Client/bin/Release/netcoreapp2.2/publish/* /usr/local/ba/client/ +systemctl start ba.client +systemctl status ba.client -l diff --git a/publish-admin.sh b/publish-admin.sh index 00fe27b0..08200ca8 100644 --- a/publish-admin.sh +++ b/publish-admin.sh @@ -1,11 +1,3 @@ #! /bin/bash -cd ~/BootstrapAdmin -git pull dotnet publish src/admin/Bootstrap.Admin -c Release - -rm -f ~/BootstrapAdmin/src/admin/Bootstrap.Admin/bin/Release/netcoreapp2.2/publish/appsettings*.json -systemctl stop ba.admin -\cp -fr ~/BootstrapAdmin/src/admin/Bootstrap.Admin/bin/Release/netcoreapp2.2/publish/* /usr/local/ba/admin/ -systemctl start ba.admin -systemctl status ba.admin diff --git a/publish-client.sh b/publish-client.sh index ad926b27..130ba9b0 100644 --- a/publish-client.sh +++ b/publish-client.sh @@ -1,11 +1,3 @@ #! /bin/bash -cd ~/BootstrapAdmin -git pull dotnet publish src/client/Bootstrap.Client -c Release - -rm -f ~/BootstrapAdmin/src/client/Bootstrap.Client/bin/Release/netcoreapp2.2/publish/appsettings*.json -systemctl stop ba.client -\cp -fr ~/BootstrapAdmin/src/client/Bootstrap.Client/bin/Release/netcoreapp2.2/publish/* /usr/local/ba/client/ -systemctl start ba.client -systemctl status ba.client diff --git a/watch-run-admin.cmd b/watch-run-admin.cmd index 782c6476..571158d4 100644 --- a/watch-run-admin.cmd +++ b/watch-run-admin.cmd @@ -1,3 +1,3 @@ @echo off -dotnet watch --project ./src/admin/Bootstrap.Admin run \ No newline at end of file +dotnet watch --project ./src/admin/Bootstrap.Admin run diff --git a/watch-run-admin.sh b/watch-run-admin.sh index fa427aef..f6aa9f20 100644 --- a/watch-run-admin.sh +++ b/watch-run-admin.sh @@ -1,3 +1,3 @@ #! /bin/bash -dotnet watch --project ./src/admin/Bootstrap.Admin run \ No newline at end of file +dotnet watch --project ./src/admin/Bootstrap.Admin run diff --git a/watch-run-client.cmd b/watch-run-client.cmd index ce983821..058db3e7 100644 --- a/watch-run-client.cmd +++ b/watch-run-client.cmd @@ -1,3 +1,3 @@ @echo off -dotnet watch --project ./src/client/Bootstrap.Client run \ No newline at end of file +dotnet watch --project ./src/client/Bootstrap.Client run diff --git a/watch-run-client.sh b/watch-run-client.sh index 87a84eec..0457f727 100644 --- a/watch-run-client.sh +++ b/watch-run-client.sh @@ -1,3 +1,3 @@ #! /bin/bash -dotnet watch --project ./src/client/Bootstrap.Client run \ No newline at end of file +dotnet watch --project ./src/client/Bootstrap.Client run