Fixed sha3 version string rendering.

sireum · Oct 28, 2024 · 33b49f0 · 33b49f0
1 parent fd8d5e6
commit 33b49f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/library/jvm/src/main/scala/org/sireum/Init.scala b/library/jvm/src/main/scala/org/sireum/Init.scala
@@ -1261,7 +1261,7 @@ import Init._
     val formsJar = home / "lib" / "forms.jar"
     val ver = formsJar.up / s"${formsJar.name}.ver"
     val version = s"${versions.get("org.sireum.version.forms").get}"
-    val versionWithSireum = s"$version-${(sireumJar.sha3(8), "")}"
+    val versionWithSireum = s"$version-${sireumJar.sha3(8)}"
     if (ver.exists && ver.read == versionWithSireum) {
       return
     }

diff --git a/library/jvm/src/main/scala/org/sireum/Os_Ext.scala b/library/jvm/src/main/scala/org/sireum/Os_Ext.scala
@@ -1234,7 +1234,7 @@ object Os_Ext {
     val md = java.security.MessageDigest.getInstance(name.value)
     val digest = md.digest(readU8s(path).elements.map(_.value).toArray)
     val s = ISZ((for (d <- digest) yield U8(d)).toSeq: _*)
-    st"${if (numOfBytes > 0) Jen.IS(s).take(numOfBytes).toISZ else s}".render.value.toLowerCase
+    st"${(if (numOfBytes > 0) Jen.IS(s).take(numOfBytes).toISZ else s, "")}".render.value.toLowerCase
   }
 
   private def toIO(path: String): JFile = new JFile(path.value)

diff --git a/library/jvm/src/main/scala/org/sireum/project/DependencyManager.scala b/library/jvm/src/main/scala/org/sireum/project/DependencyManager.scala
@@ -327,7 +327,7 @@ import DependencyManager._
         p.downloadFrom(dep)
         println()
         val version = p.sha3(8)
-        val pv = p.up.canon / st"${ops.StringOps(p.name).substring(0, p.name.size - 4)}-${(version, "")}.jar".render
+        val pv = p.up.canon / st"${ops.StringOps(p.name).substring(0, p.name.size - 4)}-$version.jar".render
         p.moveOverTo(pv)
         return (Some(pv), version)
     }