Submodule tweaks (#58)

* fixup submodule handling * revert debugging change
nim-lang · Aug 1, 2023 · e9907d7 · e9907d7
1 parent b00fd8d
commit e9907d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/atlas.nim b/src/atlas.nim
@@ -454,7 +454,9 @@ proc installDependencies(c: var AtlasContext; nimbleFile: string; startIsDep: bo
 proc updateDir(c: var AtlasContext; dir, filter: string) =
   ## update the package's VCS
   for kind, file in walkDir(dir):
+    debug c, toRepo(c.workspace / "updating"), "checking directory: " & $kind & " file: " & file.absolutePath
     if kind == pcDir and isGitDir(file):
+      trace c, toRepo(file), "updating directory"
       gitops.updateDir(c, file, filter)
 
 proc patchNimbleFile(c: var AtlasContext; dep: string): string =

diff --git a/src/gitops.nim b/src/gitops.nim
@@ -18,7 +18,9 @@ type
     GitMergeBase = "git merge-base"
     GitLsFiles = "git -C $1 ls-files",
 
-proc isGitDir*(path: string): bool = dirExists(path / ".git")
+proc isGitDir*(path: string): bool =
+  let gitPath = path / ".git"
+  dirExists(gitPath) or fileExists(gitPath)
 
 proc sameVersionAs*(tag, ver: string): bool =
   const VersionChars = {'0'..'9', '.'}
@@ -61,7 +63,7 @@ proc exec*(c: var AtlasContext;
     inc c.step
   else:
     let cmd = if execDir.len() == 0: $cmd else: $(cmd) % [execDir]
-    if dirExists(".git"):
+    if isGitDir(if execDir.len() == 0: getCurrentDir() else: execDir):
       result = silentExec(cmd, args)
     else:
       result = ("not a git repository", 1)