From 30d12734fb72b98da5c46ba247b9f0d91d151e24 Mon Sep 17 00:00:00 2001
From: ansgarz <ansgar.zwick@meissa.de>
Date: Tue, 27 Aug 2024 09:14:18 +0200
Subject: [PATCH] refactor unsafe operators & method installHugoByDeb

---
 .run/testquick.run.xml                                |  2 +-
 .../provs/desktop/infrastructure/Hugo.kt              | 11 +++--------
 .../core/processors/RemoteUbuntuProcessor.kt          |  4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.run/testquick.run.xml b/.run/testquick.run.xml
index d4f2854..9fcbb78 100644
--- a/.run/testquick.run.xml
+++ b/.run/testquick.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="testquick" type="JUnit" factoryName="JUnit">
-    <module name="org.domaindrivenarchitecture.provs.provs.test" />
+    <module name="provs.test" />
     <option name="PACKAGE_NAME" value="org" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Hugo.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Hugo.kt
index 2b26c1b..7e72075 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Hugo.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Hugo.kt
@@ -1,35 +1,30 @@
 package org.domaindrivenarchitecture.provs.desktop.infrastructure
 
 import org.domaindrivenarchitecture.provs.framework.core.Prov
-import org.domaindrivenarchitecture.provs.framework.core.ProvResult
-import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir
 import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.userHome
 import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
 import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptPurge
 import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL
 
-fun Prov.installHugoByDeb() = taskWithResult {
+fun Prov.installHugoByDeb() = task {
     val sha256sum = "46692ac9b79d5bc01b0f847f6dcf651d8630476de63e598ef61a8da9461d45cd"
     val requiredHugoVersion = "0.125.5"
     val filename = "hugo_extended_0.125.5_linux-amd64.deb"
     val downloadUrl = "-L https://github.com/gohugoio/hugo/releases/download/v$requiredHugoVersion/$filename"
     val downloadDir = "${userHome()}Downloads"
-    val currentHugoVersion = cmdNoEval("hugo version").out
+    val currentHugoVersion = cmdNoEval("hugo version").out ?: ""
 
     if (needsHugoInstall(currentHugoVersion, requiredHugoVersion)) {
         if (isHugoInstalled(currentHugoVersion)) {
-            if (currentHugoVersion!!.contains("snap")) {
+            if (currentHugoVersion.contains("snap")) {
                 cmd("snap remove hugo", sudo = true)
             } else {
                 aptPurge("hugo")
             }
         }
         aptInstall("gnupg2")
-        createDir(downloadDir)
         downloadFromURL(downloadUrl, filename, downloadDir, sha256sum = sha256sum)
         cmd("dpkg -i $downloadDir/$filename", sudo = true)
-    } else {
-        ProvResult(true)
     }
 }
 
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/RemoteUbuntuProcessor.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/RemoteUbuntuProcessor.kt
index a8d8f7f..4697e4a 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/RemoteUbuntuProcessor.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/processors/RemoteUbuntuProcessor.kt
@@ -93,9 +93,9 @@ class RemoteProcessor(val host: InetAddress, val user: String, val password: Sec
         var session: Session? = null
 
         try {
-            session = ssh.startSession()
+            session = ssh.startSession() ?: throw IllegalStateException("ERROR: Could not start ssh session.")
 
-            val cmd: Command = session!!.exec(cmdString)
+            val cmd: Command = session.exec(cmdString)
             val out = BufferedReader(InputStreamReader(cmd.inputStream)).use { it.readText() }
             val err = BufferedReader(InputStreamReader(cmd.errorStream)).use { it.readText() }
             cmd.join(100, TimeUnit.SECONDS)