Improved advanced unroll functionality

Author: BlankCanvasStudio

README.md

@@ -295,7 +295,7 @@ The file unroll.py can be called from the CLI passing a --file argument to speci
 
 **strip_cmd(nodes)** - Strips all the commands executed from a series of bash nodes in order. No replacement occurs, it simply returns the raw commands.
 
-**advanced_unroll(nodes, var_list={}, fn_dict={}, alias_table={})** - This function strips the commands executed by the series of bash nodes after resolving and command aliasing, function calls, and variable substitutions. 
+**advanced_unroll(nodes, var_list={}, fn_dict={}, alias_table={}, strip_cmds=True)** - This function resolves command aliasing, function calls, and variable substitutions in a series of bash nodes, replacing as it progresses. The strip_cmds boolean can be toggeled to return only the commands executed or the replaced nodes. 
 
 
 

bashparser/unroll.py

@@ -32,7 +32,7 @@ def apply_fn(node, vstr):
 	return unrolled_commands
 
 
-def advanced_unroll(nodes, var_list={}, fn_dict={}, alias_table={}):
+def advanced_unroll(nodes, var_list={}, fn_dict={}, alias_table={}, strip_cmds=True):
 	# The ordering of this function is important. Tread lightly
 
 	nodes = bashparser.build_and_resolve_aliasing(nodes, alias_table)
@@ -41,9 +41,13 @@ def advanced_unroll(nodes, var_list={}, fn_dict={}, alias_table={}):
 
 	nodes = bashparser.substitute_variables(nodes, var_list)
 
-	commands = strip_cmd(nodes)
+	if strip_cmds:
+		ret_val = strip_cmd(nodes)
+	else:
+		ret_val = nodes
+
+	return ret_val
 
-	return commands
 
 def main():
 	import argparse