Changed how variables get output from commands
This commit is contained in:
parent
e074a74063
commit
3d89fc26a0
|
@ -52,7 +52,7 @@ def varReplace(cmd):
|
||||||
out += " "
|
out += " "
|
||||||
if vars.has(word)==True:
|
if vars.has(word)==True:
|
||||||
new = str(vars[word])
|
new = str(vars[word])
|
||||||
write(word + " ==> " + new, 2)
|
write(word + " => " + new, 2)
|
||||||
out += new
|
out += new
|
||||||
else:
|
else:
|
||||||
out += word
|
out += word
|
||||||
|
@ -67,7 +67,7 @@ def aliasReplace(cmd):
|
||||||
if index > 0:
|
if index > 0:
|
||||||
out += " "
|
out += " "
|
||||||
if alias.has(word) == True:
|
if alias.has(word) == True:
|
||||||
write(word + " ==> " + alias[word], 2)
|
write(word + " => " + alias[word], 2)
|
||||||
out += aliasReplace(alias[word])
|
out += aliasReplace(alias[word])
|
||||||
else:
|
else:
|
||||||
out += word
|
out += word
|
||||||
|
@ -82,12 +82,12 @@ def run(string):
|
||||||
cmd = varReplace(cmd)
|
cmd = varReplace(cmd)
|
||||||
cmd = aliasReplace(cmd)
|
cmd = aliasReplace(cmd)
|
||||||
|
|
||||||
result = runCmd(cmd)
|
|
||||||
|
|
||||||
if var == None:
|
if var == None:
|
||||||
ans += [ result ]
|
ans += [ runCmd(cmd) ]
|
||||||
else:
|
else:
|
||||||
vars[var] = result
|
disable()
|
||||||
|
vars[var] = runCmd(cmd)
|
||||||
|
enable()
|
||||||
|
|
||||||
if len(ans) == 1:
|
if len(ans) == 1:
|
||||||
return ans[0]
|
return ans[0]
|
||||||
|
|
Loading…
Reference in New Issue