Merge pull request #245 from RecursiveProgrammer/master

Address Ubuntu Error with Agent
immense · Mar 12, 2021 · c9bb624 · c9bb624
2 parents fc66f72 + 7674a0e
commit c9bb624
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/Agent/Services/AppLauncherLinux.cs b/Agent/Services/AppLauncherLinux.cs
@@ -40,7 +40,7 @@ public async Task<int> LaunchChatService(string orgName, string requesterID, Hub
                     $"-requester \"{requesterID}\" " +
                     $"-organization \"{orgName}\" " +
                     $"-host \"{ConnectionInfo.Host}\" " +
-                    $"-orgid \"{ConnectionInfo.OrganizationID}\" & disown";
+                    $"-orgid \"{ConnectionInfo.OrganizationID}\"";
                 return StartLinuxDesktopApp(args);
             }
             catch (Exception ex)
@@ -70,7 +70,7 @@ public async Task LaunchRemoteControl(int targetSessionId, string requesterID, s
                     $"-serviceid \"{serviceID}\" " +
                     $"-deviceid {ConnectionInfo.DeviceID} " +
                     $"-host \"{ConnectionInfo.Host}\" " +
-                    $"-orgid \"{ConnectionInfo.OrganizationID}\" & disown";
+                    $"-orgid \"{ConnectionInfo.OrganizationID}\"";
                 StartLinuxDesktopApp(args);
             }
             catch (Exception ex)
@@ -92,7 +92,7 @@ public async Task RestartScreenCaster(List<string> viewerIDs, string serviceID,
                     $"-host \"{ConnectionInfo.Host}\" " +
                     $"-orgid \"{ConnectionInfo.OrganizationID}\" " +
                     $"-relaunch true " +
-                    $"-viewers {string.Join(",", viewerIDs)} & disown";
+                    $"-viewers {string.Join(",", viewerIDs)}";
                 StartLinuxDesktopApp(args);
             }
             catch (Exception ex)

diff --git a/Agent/makefile b/Agent/makefile
@@ -0,0 +1,18 @@
+
+# Notes:
+# Possibly use the automake suite to build this, but since this is package is geared towards both Windows and Linux, I do not think it prudent.
+
+currentversion=2021.03.04
+
+all:
+	@ echo "This is help with compiling the Agent. This assumes you have the dotnet application installed."
+	@ echo "You should now run: make build"
+
+build:
+	#dotnet build Agent.csproj
+	dotnet publish /p:Version=$(currentversion) /p:FileVersion=$(currentversion) --runtime linux-x64 --configuration Release -p:PublishTrimmed=True --output ".\bin\Release\net5.0\linux-x64\publish" "..\Agent"
+
+package:
+	    zip -r linux-x64.zip ./bin/Release/net5.0/linux-x64.zip
+
+
diff --git a/Server/wwwroot/Downloads/Ubuntu-Upgrade.sh b/Server/wwwroot/Downloads/Ubuntu-Upgrade.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
 
-AppRoot=$(cat /etc/systemd/system/remotely.service | grep -i "execstart" | cut -d' ' -f 2)
+AppRoot=$(cat /etc/systemd/system/remotely.service | grep -i "execstart" | cut -d' ' -f 2 | sed -e 's/\/[^\/]*$/\//')
 
 echo "Remotely server upgrade started."
 
 echo "Target path: $AppRoot"
 
 read -p "If this is not correct, press Ctrl + C now to abort!"
 
-
 echo "Ensuring dependencies are installed."
 
  # Install other prerequisites.
@@ -28,4 +27,4 @@ chown -R "$USER":www-data $AppRoot
 # Restart service.
 systemctl restart remotely.service
 
-echo "Update complete."
+echo "Update complete."