From 82a9af5beacd60fd1526b3b72734dc8484fb8be6 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 10 Dec 2019 15:02:39 +0100
Subject: Simplify some code, remove unused stuff

---
 src/main/java/org/openslx/taskmanager/tasks/DownloadFiles.java | 10 ++--------
 src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java  |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/openslx/taskmanager/tasks/DownloadFiles.java b/src/main/java/org/openslx/taskmanager/tasks/DownloadFiles.java
index c274462..942eca9 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/DownloadFiles.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/DownloadFiles.java
@@ -182,10 +182,7 @@ public class DownloadFiles extends AbstractTask
 		} catch ( InterruptedException e ) {
 			Thread.currentThread().interrupt();
 		}
-		try {
-			FileUtils.forceDelete( gpgDir );
-		} catch ( Exception e1 ) {
-		}
+		FileUtils.deleteQuietly( gpgDir );
 		if ( retval.get() ) {
 			// Move dir to proper location
 			File dest = new File( this.baseDir );
@@ -203,10 +200,7 @@ public class DownloadFiles extends AbstractTask
 			}
 		}
 		if ( !retval.get() ) {
-			try {
-				FileUtils.forceDelete( tmpDir.toFile() );
-			} catch ( Exception e ) {
-			}
+			FileUtils.deleteQuietly( tmpDir.toFile() );
 		}
 		return retval.get();
 	}
diff --git a/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java b/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java
index 0e09a85..f5d9a4b 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java
@@ -52,7 +52,7 @@ public class RemoteReboot extends AbstractTask
 
 	private Output status = new Output();
 
-	private static final String BASE_CMD = "/opt/openslx/scripts/idleaction-scheduled_action --detach";
+	private static final String BASE_CMD = "/opt/openslx/scripts/idleaction-scheduled_action";
 	
 	private static final String REBOOT_CMD = BASE_CMD + " reboot";
 	
@@ -81,7 +81,6 @@ public class RemoteReboot extends AbstractTask
 		if ( status.error != null )
 			return false;
 		
-		status.clients = clients;
 		Date shutdownTime = new Date( System.currentTimeMillis() + minutes * 60 * 1000 );
 		SimpleDateFormat sdf = new SimpleDateFormat( "HH:mm" );
 		status.time = sdf.format( shutdownTime );
@@ -267,7 +266,6 @@ public class RemoteReboot extends AbstractTask
 	static class Output
 	{
 		private Map<String, ClientStatus> clientStatus = new ConcurrentHashMap<>();
-		private Client[] clients;
 		private String time;
 		private String locationId;
 		private String error;
-- 
cgit v1.2.3-55-g7522