latest

asdfjkl · Jan 4, 2020 · 7adf3d4 · 7adf3d4
1 parent a4e086b
commit 7adf3d4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/yahb/CopyModule.cs b/yahb/CopyModule.cs
@@ -53,6 +53,17 @@ public List<String> createDirectoryList() {
                     dir_stack.Push(cfg.sourceDirectory);
                 }
 
+                // add directories from file here to stack
+                // /s is used, in order to get all
+                // subdirs
+                if(cfg.copySubDirectories)
+                {
+                    foreach( string dir_i in cfg.inputDirectories)
+                    {
+                        dir_stack.Push(dir_i);
+                    }
+                }
+
                 List<string> subdirs;
                 while (dir_stack.Count > 0)
                 {
@@ -110,7 +121,12 @@ public List<String> createDirectoryList() {
                 dirs.Add(cfg.sourceDirectory);
             }
             // get directories from provided input file
-            dirs.AddRange(cfg.inputDirectories);
+            // but only if /s was not provided (otherwise)
+            // above stack operation added them incl. subdirs
+            if (!cfg.copySubDirectories)
+            {
+                dirs.AddRange(cfg.inputDirectories);
+            }
 
             // filter directories according to input given
             List<String> dirs_filtered = new List<String>();

diff --git a/yahb/ParseCmdLine.cs b/yahb/ParseCmdLine.cs
@@ -202,9 +202,9 @@ public void DisplayVerboseHelp()
             Console.WriteLine("                              If this options is used, <source-dir> can be");
             Console.WriteLine("                              omitted. If both <source-dir> and /id:FILENAME");
             Console.WriteLine("                              are present, all directories will be copied.");
-            Console.WriteLine("                              NOTE that if /s is provided, it will NOT be ");
-            Console.WriteLine("                              applied to the list of input directories, but");
-            Console.WriteLine("                              will be applied to <source-dir>.");
+            Console.WriteLine("                              NOTE that if /s is provided, it will be ");
+            Console.WriteLine("                              applied to the list of input directories, and");
+            Console.WriteLine("                              will also be applied to <source-dir>.");
             Console.WriteLine("");
             Console.WriteLine("  /list                    :: do not copy anything, just list all files");
             Console.WriteLine("");