Replace opt with nop

Author: firasuke

src/bootstrap.nim

@@ -56,10 +56,10 @@ proc buildCross*() =
 
       # Utilities
       $dash,
+      $grep,
       $kmod,
       $libudevZero,
       $toybox,
-      $ugrep,
       $utilLinux,
 
       # Services
@@ -139,14 +139,14 @@ proc buildNative*() =
       $wget2,
 
       # Utilities
+      $grep,
       $hwdata,
       $kmod,
       $less,
       $libudevZero,
       $neatvi,
       $pciutils,
       $toybox,
-      $ugrep,
       $utilLinux,
       $yash,
 

src/cerata.nim

@@ -11,7 +11,7 @@ import
   toposort
 
 type Ceras = object
-  nom, ver, url, sum, bld, run, opt = $Nil
+  nom, ver, url, sum, bld, run, nop = $Nil
 
 proc `$`(self: Ceras): string =
   self.nom
@@ -45,7 +45,7 @@ url  :: {ceras.url}
 sum  :: {ceras.sum}
 bld  :: {ceras.bld}
 run  :: {ceras.run}
-opt  :: {ceras.opt}
+nop  :: {ceras.nop}
 """
 
 proc printContent(idx: int, nom, ver, cmd: string) =
@@ -172,11 +172,11 @@ proc buildCerata*(cerata: openArray[string], stage = $native, resolve = true) =
     if stage != $toolchain:
       setEnvFlags()
 
-      if $radFlags.lto in $ceras.opt:
-        setEnvFlagsOptLto()
+      if $radFlags.lto in $ceras.nop:
+        setEnvFlagsNopLto()
 
-      if $radFlags.parallel in $ceras.opt:
-        setEnvFlagsOptParallel()
+      if $radFlags.parallel in $ceras.nop:
+        setEnvFlagsNopParallel()
 
     putEnv($MAKEFLAGS, $radFlags.make)
 
@@ -223,7 +223,7 @@ proc buildCerata*(cerata: openArray[string], stage = $native, resolve = true) =
 
         removeDir(getEnv($SACD))
 
-      if $bootstrap in $ceras.opt:
+      if $bootstrap in $ceras.nop:
         discard extractTar(archive, $DirSep)
 
     cursorUp 1

src/constants.nim

@@ -34,6 +34,7 @@ type
     gettextTiny = "gettext-tiny"
     gmp
     gperf
+    grep
     hwdata
     iproute2
     isl
@@ -79,7 +80,6 @@ type
     skalibs
     slibtool
     toybox
-    ugrep
     utilLinux = "util-linux"
     utmps
     wget2
@@ -215,7 +215,7 @@ rad version 0.1.0
 Copyright (c) 2018-2025, Firas Khalil Khana
 Distributed under the terms of the ISC License"""
 
-  radOpt* = enum
+  radNop* = enum
     bootstrap
     check
     empty

src/flags.nim

@@ -9,11 +9,11 @@ proc setEnvFlags*() =
   putEnv($LDFLAGS, &"{ldflags} {cflags}")
   putEnv($MAKEFLAGS, $radFlags.make)
 
-proc setEnvFlagsOptLto*() =
+proc setEnvFlagsNopLto*() =
   putEnv($CFLAGS, replace($cflags, $radFlags.lto))
   putEnv($CXXFLAGS, getEnv($CFLAGS))
   putEnv($LDFLAGS, $ldflags)
   putEnv($MAKEFLAGS, $radFlags.make)
 
-proc setEnvFlagsOptParallel*() =
+proc setEnvFlagsNopParallel*() =
   putEnv($MAKEFLAGS, $radFlags.parallel)

tests/flags/testSetEnvFlagsOptLto.nim

@@ -3,7 +3,7 @@
 
 import std/os, ../../src/[constants, flags]
 
-setEnvflagsOptLto()
+setEnvflagsNopLto()
 
 echo "CFLAGS     :: ", getEnv($CFLAGS)
 echo "CXXFLAGS   :: ", getEnv($CXXFLAGS)

tests/flags/testSetEnvFlagsOptParallel.nim

@@ -3,7 +3,7 @@
 
 import std/os, ../../src/[constants, flags]
 
-setEnvflagsOptParallel()
+setEnvflagsNopParallel()
 
 echo "MAKEFLAGS  :: ", getEnv($MAKEFLAGS)