@@ -176,6 +182,31 @@
+ linux-arm-32bit Bash Installer
+
+ Linux Files Only
+
+
sudo chmod +x [path]/Install-arm.sh
+ sudo [path]/./Install-arm.sh
+
+ +
sudo [path]/Install-arm.sh --path [path]/Remotely-Linux.zip
+
+ +
sudo [path]/Install-arm.sh --uninstall
+
+ diff --git a/Server/wwwroot/Content/Install-arm.sh b/Server/wwwroot/Content/Install-arm.sh new file mode 100644 index 000000000..94cda9a52 --- /dev/null +++ b/Server/wwwroot/Content/Install-arm.sh @@ -0,0 +1,114 @@ +#!/bin/bash +HostName= +Organization= +GUID=$(cat /proc/sys/kernel/random/uuid) +UpdatePackagePath="" + + +Args=( "$@" ) +ArgLength=${#Args[@]} + +for (( i=0; i<${ArgLength}; i+=2 )); +do + if [ "${Args[$i]}" = "--uninstall" ]; then + systemctl stop remotely-agent + rm -r -f /usr/local/bin/Remotely + rm -f /etc/systemd/system/remotely-agent.service + systemctl daemon-reload + exit + elif [ "${Args[$i]}" = "--path" ]; then + UpdatePackagePath="${Args[$i+1]}" + fi +done + +UbuntuVersion=$(lsb_release -r -s) + +# Install .NET Core Runtime. +curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -c 6.0 +echo 'export DOTNET_ROOT=$HOME/.dotnet' >> ~/.bashrc +echo 'export PATH=$PATH:$HOME/.dotnet' >> ~/.bashrc +source ~/.bashrc + +apt-get -y install libx11-dev +apt-get -y install libxrandr-dev +apt-get -y install unzip +apt-get -y install libc6-dev +apt-get -y install libgdiplus +apt-get -y install libxtst-dev +apt-get -y install xclip +apt-get -y install jq +apt-get -y install curl + +sudo curl -fsSL https://deb.nodesource.com/setup_17.x | bash - +sudo apt install nodejs + +if [ -f "/usr/local/bin/Remotely/ConnectionInfo.json" ]; then + SavedGUID=`cat "/usr/local/bin/Remotely/ConnectionInfo.json" | jq -r '.DeviceID'` + if [[ "$SavedGUID" != "null" && -n "$SavedGUID" ]]; then + GUID="$SavedGUID" + fi +fi + +rm -r -f /usr/local/bin/Remotely +rm -f /etc/systemd/system/remotely-agent.service + +mkdir -p /usr/local/bin/Remotely/ +cd /usr/local/bin/Remotely/ + +if [ -z "$UpdatePackagePath" ]; then + echo "Downloading client..." >> /tmp/Remotely_Install.log + wget $HostName/Content/Remotely-Linux-arm.zip +else + echo "Copying install files..." >> /tmp/Remotely_Install.log + cp "$UpdatePackagePath" /usr/local/bin/Remotely/Remotely-Linux-arm.zip + rm -f "$UpdatePackagePath" +fi + +unzip ./Remotely-Linux-arm.zip +rm -f ./Remotely-Linux-arm.zip +chmod +x ./Remotely_Agent +chmod +x ./Desktop/Remotely_Desktop + + +connectionInfo="{ + \"DeviceID\":\"$GUID\", + \"Host\":\"$HostName\", + \"OrganizationID\": \"$Organization\", + \"ServerVerificationToken\":\"\" +}" + +echo "$connectionInfo" > ./ConnectionInfo.json + +runtimeOptions="{ + \"runtimeOptions\": { + \"configProperties\": { + \"System.Drawing.EnableUnixSupport\": true + } + } +}" + +echo "$runtimeOptions" > ./Desktop/Remotely_Desktop.runtimeconfig.json + +curl --head $HostName/Content/Remotely-Linux.zip | grep -i "etag" | cut -d' ' -f 2 > ./etag.txt + +echo Creating service... >> /tmp/Remotely_Install.log + +serviceConfig="[Unit] +Description=The Remotely agent used for remote access. + +[Service] +WorkingDirectory=/usr/local/bin/Remotely/ +ExecStart=/usr/local/bin/Remotely/Remotely_Agent +Restart=always +StartLimitIntervalSec=0 +RestartSec=10 + +[Install] +WantedBy=graphical.target" + +echo "$serviceConfig" > /etc/systemd/system/remotely-agent.service + +systemctl enable remotely-agent +systemctl restart remotely-agent + +echo Install complete. >> /tmp/Remotely_Install.log diff --git a/Shared/Utilities/EnvironmentHelper.cs b/Shared/Utilities/EnvironmentHelper.cs index 66379c020..6ff1ce84f 100644 --- a/Shared/Utilities/EnvironmentHelper.cs +++ b/Shared/Utilities/EnvironmentHelper.cs @@ -60,6 +60,8 @@ public static bool IsDebug public static bool IsWindows => OperatingSystem.IsWindows(); + public static bool Is64 => Environment.Is64BitProcess; + public static Platform Platform { get diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1 index 74c7a584a..ceb39797e 100644 --- a/Utilities/Publish.ps1 +++ b/Utilities/Publish.ps1 @@ -116,23 +116,30 @@ if ((Test-Path -Path "$Root\Agent\bin\Release\net6.0\win10-x86\publish" ) -eq $ if ((Test-Path -Path "$Root\Agent\bin\Release\net6.0\linux-x64\publish") -eq $true) { Get-ChildItem -Path "$Root\Agent\bin\Release\net6.0\linux-x64\publish" | Remove-Item -Force -Recurse } +if ((Test-Path -Path "$Root\Agent\bin\Release\net6.0\linux-arm\publish") -eq $true) { + Get-ChildItem -Path "$Root\Agent\bin\Release\net6.0\linux-arm\publish" | Remove-Item -Force -Recurse +} # Publish Core clients. dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net6.0\win10-x64\publish" "$Root\Agent" dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net6.0\linux-x64\publish" "$Root\Agent" dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --self-contained --configuration Release --output "$Root\Agent\bin\Release\net6.0\win10-x86\publish" "$Root\Agent" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-arm --self-contained --configuration Release --output "$Root\Agent\bin\Release\net6.0\linux-arm\publish" "$Root\Agent" New-Item -Path "$Root\Agent\bin\Release\net6.0\win10-x64\publish\Desktop\" -ItemType Directory -Force New-Item -Path "$Root\Agent\bin\Release\net6.0\win10-x86\publish\Desktop\" -ItemType Directory -Force New-Item -Path "$Root\Agent\bin\Release\net6.0\linux-x64\publish\Desktop\" -ItemType Directory -Force +New-Item -Path "$Root\Agent\bin\Release\net6.0\linux-arm\publish\Desktop\" -ItemType Directory -Force # Publish Linux ScreenCaster dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=packaged-linux-x64 --configuration Release "$Root\Desktop.XPlat\" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=packaged-linux-arm --configuration Release "$Root\Desktop.XPlat\" # Publish Linux GUI App dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=desktop-linux-x64 --configuration Release "$Root\Desktop.XPlat\" +dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion -p:PublishProfile=desktop-linux-arm --configuration Release "$Root\Desktop.XPlat\" # Publish Windows ScreenCaster (32-bit) @@ -159,7 +166,7 @@ if ($SignAssemblies) { &"$Root\Utilities\signtool.exe" sign /f "$CertificatePath" /p $CertificatePassword /t http://timestamp.digicert.com "$Root\Server\wwwroot\Content\Win-x86\Remotely_Desktop.exe" } -# Build installer. +# Build installer (Windows). &"$MSBuildPath" "$Root\Agent.Installer.Win" /t:Restore &"$MSBuildPath" "$Root\Agent.Installer.Win" /t:Build /p:Configuration=Release /p:Platform=AnyCPU /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion Copy-Item -Path "$Root\Agent.Installer.Win\bin\Release\Remotely_Installer.exe" -Destination "$Root\Server\wwwroot\Content\Remotely_Installer.exe" -Force @@ -189,6 +196,13 @@ while ((Test-Path -Path "$PublishDir\Remotely-Linux.zip") -eq $false){ } Move-Item -Path "$PublishDir\Remotely-Linux.zip" -Destination "$Root\Server\wwwroot\Content\Remotely-Linux.zip" -Force +$PublishDir = "$Root\Agent\bin\Release\net6.0\linux-arm\publish" +Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Linux-arm.zip" -Force +while ((Test-Path -Path "$PublishDir\Remotely-Linux-arm.zip") -eq $false){ + Start-Sleep -Seconds 1 +} +Move-Item -Path "$PublishDir\Remotely-Linux-arm.zip" -Destination "$Root\Server\wwwroot\Content\Remotely-Linux-arm.zip" -Force + if ($RID.Length -gt 0 -and $OutDir.Length -gt 0) {