Add setting of pkgChecksum field

The field `checksum` in installation `ConfigData` is renamed to `pkgChecksum` and it is being set when parsing an installation `ini` file. Related to nim-lang/nimble#127
bobeff · Oct 1, 2021 · 2f94698 · 2f94698
1 parent cfffaa1
commit 2f94698
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/tools/niminst/deinstall.nimf b/tools/niminst/deinstall.nimf
@@ -21,23 +21,23 @@ if [ $# -eq 1 ] ; then
       libdir=/usr/lib/?proj
       docdir=/usr/share/?proj/doc
       datadir=/usr/share/?proj/data
-      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.checksum"
+      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.pkgChecksum"
       ;;
     "/usr/local/bin")
       bindir=/usr/local/bin
       configdir=/etc/?proj
       libdir=/usr/local/lib/?proj
       docdir=/usr/local/share/?proj/doc
       datadir=/usr/local/share/?proj/data
-      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.checksum"
+      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.pkgChecksum"
       ;;
     "/opt")
       bindir="/opt/?proj/bin"
       configdir="/opt/?proj/config"
       libdir="/opt/?proj/lib"
       docdir="/opt/?proj/doc"
       datadir="/opt/?proj/data"
-      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.checksum"
+      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.pkgChecksum"
       ;;
     *)
       bindir="$1/?proj/bin"

diff --git a/tools/niminst/install.nimf b/tools/niminst/install.nimf
@@ -34,23 +34,23 @@ if [ $# -eq 1 ] ; then
       libdir=/usr/lib/?proj
       docdir=/usr/share/?proj/doc
       datadir=/usr/share/?proj/data
-      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.checksum"
+      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.pkgChecksum"
       ;;
     "/usr/local/bin")
       bindir=/usr/local/bin
       configdir=/etc/?proj
       libdir=/usr/local/lib/?proj
       docdir=/usr/local/share/?proj/doc
       datadir=/usr/local/share/?proj/data
-      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.checksum"
+      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.pkgChecksum"
       ;;
     "/opt")
       bindir="/opt/?proj/bin"
       configdir="/opt/?proj/config"
       libdir="/opt/?proj/lib"
       docdir="/opt/?proj/doc"
       datadir="/opt/?proj/data"
-      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.checksum"
+      nimbleDir="/opt/nimble/pkgs2/?c.nimblePkgName-?c.version-?c.pkgChecksum"
       mkdir -p /opt/?proj
       mkdir -p $bindir
       mkdir -p $configdir

diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim
@@ -63,7 +63,7 @@ type
     nimArgs: string
     debOpts: TDebOptions
     nimblePkgName: string
-    checksum: string
+    pkgChecksum: string
 
 const
   unixDirVars: array[fcConfig..fcLib, string] = [
@@ -408,6 +408,8 @@ proc parseIniFile(c: var ConfigData) =
             c.nimblePkgName = v
           of "pkgfiles":
             addFiles(c.cat[fcNimble], split(v, {';'}))
+          of "pkgchecksum":
+            c.pkgChecksum = v
           else:
             quit(errorStr(p, "invalid key: " & k.key))
         else: quit(errorStr(p, "invalid section: " & section))