Improvements

Author: firasuke

src/arch.nim

@@ -3,7 +3,7 @@
 
 import std/[os, osproc, strformat, strutils, times], constants
 
-proc getTuple*(): (string, int) =
+proc getTuple(): (string, int) =
   execCmdEx($radClustersCerataLib / $slibtool / $configGuess)
 
 proc setEnvArch*(stage = native) =

src/cerata.nim

@@ -26,20 +26,16 @@ proc distcleanCerata*() =
   removeDir($radPkgCache)
   removeDir($radSrcCache)
 
-proc getCerasPath(nom: string): string =
-  $radClustersCerataLib / nom / $ceras
+proc parseCeras*(nom: string): Ceras =
+  let path = $radClustersCerataLib / nom / $ceras
 
-proc checkCerasExist(nom: string) =
-  if not fileExists(getCerasPath(nom)):
+  if not fileExists(path):
     abort(&"""{"nom":8}{nom:48}""")
 
-proc parseCeras*(nom: string): Ceras =
-  Toml.loadFile(getCerasPath(nom), Ceras)
+  Toml.loadFile(path, Ceras)
 
 proc printCerata*(cerata: openArray[string]) =
   for nom in cerata.deduplicate():
-    checkCerasExist(nom)
-
     let ceras = parseCeras(nom)
 
     echo &"nom  :: {ceras}"
@@ -84,8 +80,6 @@ proc sortCerata*(cerata: openArray[string], run = true): seq[string] =
   var deps: Table[string, seq[string]]
 
   for nom in cerata.deduplicate():
-    checkCerasExist(nom)
-
     resolveDeps(nom, deps, if run: true else: false)
 
   topoSort(deps)
@@ -219,7 +213,7 @@ proc buildCerata*(cerata: openArray[string], stage = $native, resolve = true) =
     # All phases need to be called sequentially to prevent the loss of the
     # current working dir...
     var status = execCmd(
-      &"""{sh} {shellCommand} 'nom={ceras} ver={ceras.ver} {CurDir} {$radClustersCerataLib / $ceras / (
+      &"""{sh} -c 'nom={ceras} ver={ceras.ver} {CurDir} {$radClustersCerataLib / $ceras / (
         case stage
         of $native: $build
         else: $build & CurDir & stage

src/constants.nim

@@ -164,10 +164,7 @@ type
     lto = "-flto=auto -flto-compression-level=19 -fuse-linker-plugin "
     make = "-j4 -O"
     parallel = "-j1 -O"
-    shellCommand = "-c"
     shellRedirect = "> /dev/null 2>&1"
-    tarCreate = "-cpvf"
-    tarExtract = "-xmPvf"
     zstdCompress = "-22 --ultra -T0 --long"
     zstdDecompress = "-d -T0 --long"
 

src/tools.nim

@@ -11,7 +11,7 @@ proc compressZst*(file: string): int =
 
 proc createTarZst*(archive, dir: string): int =
   execCmd(
-    &"{tar} --use-compress-program '{zstd} {zstdCompress}' {tarCreate} {archive} -C {dir} {CurDir} {shellRedirect}"
+    &"{tar} --use-compress-program '{zstd} {zstdCompress}' -cpvf {archive} -C {dir} {CurDir} {shellRedirect}"
   )
 
 proc downloadFile*(file, url: string): int =
@@ -28,7 +28,7 @@ proc abort*(err: string) =
   exit(QuitFailure)
 
 proc extractTar*(archive, dir: string): int =
-  execCmd(&"{tar} {tarExtract} {archive} -C {dir} {shellRedirect}")
+  execCmd(&"{tar} -xmPvf {archive} -C {dir} {shellRedirect}")
 
 proc genSum*(dir, sum: string) =
   var files: seq[string]

tests/arch/testGetTuple.nim

@@ -12,7 +12,7 @@ echo "PRETTY_NAME  :: ", getEnv($PRETTY_NAME)
 echo "TGT          :: ", getEnv($TGT)
 
 doAssert getEnv($ARCH) == "x86-64"
-doAssert getEnv($BLD) == getTuple()[0].strip()
+doAssert getEnv($BLD).startsWith("x86_64-pc-linux-")
 doAssert getEnv($CARCH) == "x86-64-v3"
 doAssert getEnv($PRETTY_NAME).startsWith("glaucus s6 x86-64-v3 ")
 doAssert getEnv($TGT) == "x86_64-glaucus-linux-musl"