diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Gopass.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Gopass.kt index d648574..37be9fb 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Gopass.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Gopass.kt @@ -11,9 +11,9 @@ import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFrom fun Prov.installGopass( - version: String = "1.12.7", + version: String = "1.15.5", enforceVersion: Boolean = false, - sha256sum: String = "0824d5110ff1e68bff1ba10c1be63acb67cb1ad8e3bccddd6b6fc989608beca8" // checksum for sha256sum version 8.30 (e.g. ubuntu 20.04) + sha256sum: String = "23ec10015c2643f22cb305859eb36d671094d463d2eb1798cc675e7bb06f4b39" ) = taskWithResult { if (isPackageInstalled("gopass") && !enforceVersion) { @@ -45,7 +45,7 @@ fun Prov.installGopass( fun Prov.configureGopass(gopassRootFolder: String? = null, publicGpgKey: Secret? = null) = taskWithResult { - val configFile = ".config/gopass/config.yml" + val configFile = ".config/gopass/config" if (checkFile(configFile)) { return@taskWithResult ProvResult(true, out = "Gopass already configured in file $configFile") diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt index 21c9e6d..5dd3192 100644 --- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt +++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/GopassBridge.kt @@ -21,10 +21,12 @@ fun Prov.downloadGopassBridge() = task { // needs manual installation with: firefox Downloads/gopass_bridge-0.8.0-fx.xpi } -fun Prov.installGopassJsonApi() = taskWithResult { +fun Prov.installGopassJsonApi( + sha256sum: String = "ec9976e39a468428ae2eb1e2e0b9ceccba7f60d66b8097e2425b0c07f4fed108" +) = taskWithResult { // see https://github.com/gopasspw/gopass-jsonapi - val gopassJsonApiVersion = "1.11.1" - val requiredGopassVersion = "1.12.7" + val gopassJsonApiVersion = "1.15.5" + val requiredGopassVersion = "1.15.5" val filename = "gopass-jsonapi_${gopassJsonApiVersion}_linux_amd64.deb" val downloadUrl = "-L https://github.com/gopasspw/gopass-jsonapi/releases/download/v$gopassJsonApiVersion/$filename" val downloadDir = "${userHome()}Downloads" @@ -35,7 +37,7 @@ fun Prov.installGopassJsonApi() = taskWithResult { if (checkGopassVersion(requiredGopassVersion)) { aptInstall("git gnupg2") // required dependencies createDir(downloadDir) - downloadFromURL(downloadUrl, filename, downloadDir) + downloadFromURL(downloadUrl, filename, downloadDir, sha256sum = sha256sum) cmd("dpkg -i $downloadDir/$filename", sudo = true) } else { ProvResult(