diff --git a/publish/build.cmd b/publish/build.cmd index fe69ee6f..b32ce203 100644 --- a/publish/build.cmd +++ b/publish/build.cmd @@ -3,8 +3,7 @@ set startime=%time% rd /q/s "./dist/" -echo d|xcopy "./src/linux-x64/publish" "./dist/linux-x64/publish" /s /e /y /f -echo d|xcopy "./src/linux-arm64/publish" "./dist/linux-arm64/publish" /s /e /y /f +echo d|xcopy "./src" "./dist/" /s /e /y /f dotnet publish ../projects/UserCenter/UserCenter.csproj -c Release -o ../../publish/dist/linux-x64/publish/apps/UserCenter dotnet publish ../projects/IoTCenter/IoTCenter.csproj -c Release -o ../../publish/dist/linux-x64/publish/apps/IoTCenter diff --git a/publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.300-linux-arm64.tar.gz b/publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.300-linux-arm64.tar.gz deleted file mode 100644 index 1dbc4ee3..00000000 Binary files a/publish/src/linux-arm64/publish/files/dotnet-sdk-2.2.300-linux-arm64.tar.gz and /dev/null differ diff --git a/publish/src/linux-arm64/publish/install.sh b/publish/src/linux-arm64/publish/install.sh index d9f8c2d3..828fcb64 100644 --- a/publish/src/linux-arm64/publish/install.sh +++ b/publish/src/linux-arm64/publish/install.sh @@ -15,11 +15,7 @@ sudo dpkg -i ~/publish/files/n2n_2.5.0-170_armhf.deb #http://packages.ntop.org/ sudo dpkg -i ~/publish/files/n2n_2.5.0-170_armhf.deb mkdir -p ~/dotnet -if [ `uname -m` == "aarch64" ];then - tar zxf ~/publish/files/dotnet-sdk-2.2.300-linux-arm64.tar.gz -C ~/dotnet -else - tar zxf ~/publish/files/dotnet-sdk-2.2.300-linux-arm.tar.gz -C ~/dotnet -fi +tar zxf ~/publish/files/dotnet-sdk-2.2.300-linux-arm.tar.gz -C ~/dotnet if [ "`which dotnet`" == "" ]; then echo 'export PATH=$PATH:/home/pi/dotnet'>>~/.bashrc echo 'export DOTNET_ROOT=/home/pi/dotnet'>>~/.bashrc @@ -31,7 +27,7 @@ fi #config system sudo systemctl enable ssh -sudo systemctl enable vncserver-x11-serviced.service +#sudo systemctl enable vncserver-x11-serviced.service sudo timedatectl set-timezone 'Asia/Shanghai' sudo timedatectl set-ntp true diff --git a/publish/src/linux-arm64/publish/supervisor/n2n.conf b/publish/src/linux-arm64/publish/supervisor/n2n.conf deleted file mode 100644 index e4593c32..00000000 --- a/publish/src/linux-arm64/publish/supervisor/n2n.conf +++ /dev/null @@ -1,5 +0,0 @@ -[program:n2n] -command=edge -a 172.16.0.1 -c myvpn -l dsideal.nbaxp.com:1234 -autostart=true -autorestart=true -user=pi \ No newline at end of file diff --git a/publish/src/linux-arm64/publish/supervisor/srs.conf b/publish/src/linux-arm64/publish/supervisor/srs.conf index 2e369aeb..5a47a6bb 100644 --- a/publish/src/linux-arm64/publish/supervisor/srs.conf +++ b/publish/src/linux-arm64/publish/supervisor/srs.conf @@ -1,6 +1,6 @@ [program:srs] directory=/home/pi/publish/apps/srs -command=/home/pi/publish/apps/srs/objs/srs -c /home/pi/publish/apps/srs/conf/srs.conf +command=bash -c "./objs/srs -c conf/srs.conf autostart=true autorestart=true user=pi \ No newline at end of file diff --git a/tools/n2n/edge.exe b/publish/src/win-x86/n2n/edge.exe similarity index 100% rename from tools/n2n/edge.exe rename to publish/src/win-x86/n2n/edge.exe diff --git a/tools/n2n/n2n.lib b/publish/src/win-x86/n2n/n2n.lib similarity index 100% rename from tools/n2n/n2n.lib rename to publish/src/win-x86/n2n/n2n.lib diff --git a/tools/n2n/supernode.exe b/publish/src/win-x86/n2n/supernode.exe similarity index 100% rename from tools/n2n/supernode.exe rename to publish/src/win-x86/n2n/supernode.exe diff --git a/tools/n2n/tap-windows-9.21.2.exe b/publish/src/win-x86/n2n/tap-windows-9.21.2.exe similarity index 100% rename from tools/n2n/tap-windows-9.21.2.exe rename to publish/src/win-x86/n2n/tap-windows-9.21.2.exe