Fix temp file bug

Removed temp file altogether
xonixx · Nov 21, 2021 · ae2480d · ae2480d
1 parent 81c56e5
commit ae2480d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/makesure.awk b/makesure.awk
@@ -14,7 +14,7 @@ BEGIN {
   split("",GoalsByName) # name -> private
   split("",Code)        # name -> body
   split("",DefineOverrides) # k -> ""
-  DefinesFile=""
+  DefinesCode=""
   split("",Dependencies)       # name,i -> dep goal
   split("",DependenciesLineNo) # name,i -> line no.
   split("",DependenciesCnt)    # name   -> dep cnd
@@ -142,14 +142,11 @@ function handleDefine() {
   handleDefineLine($0)
 }
 function handleDefineLine(line,   kv,l) {
-  if (!DefinesFile)
-    DefinesFile = executeGetLine("mktemp " Tmp "/makesure.XXXXXXXXXX")
-
   splitKV(line, kv)
 
   if (!(kv[0] in DefineOverrides)) {
     handleCodeLine(l = line "; export " kv[0])
-    handleCodeLine("echo " quoteArg(l) " >> " DefinesFile)
+    DefinesCode = DefinesCode "\n" line "; export " kv[0]
   }
 }
 
@@ -402,8 +399,8 @@ body,goalBody,goalBodies,resolvedGoals,exitCode, t0,t1,t2, goalTimed, list) {
     }
 
     addLine(definesLine, MyDirScript)
-    if (DefinesFile)
-      addLine(definesLine, ". " DefinesFile)
+    if (DefinesCode)
+      addLine(definesLine, DefinesCode)
 
     for (i = 0; i in GoalNames; i++) {
       goalName = GoalNames[i]
@@ -502,8 +499,6 @@ function currentLibName() { return arrLast(LibNames) }
 
 function realExit(code) {
   Died = 1
-  if (DefinesFile)
-    rm(DefinesFile)
   exit code
 }
 function addError(err, n) { if (!n) n=NR; Error=addL(Error, err ":\n" ARGV[1] ":" n ": " Lines[n]) }

diff --git a/tests/15_lib.sh b/tests/15_lib.sh
@@ -1,12 +1,9 @@
 
-# TODO found one other bug, but let's fix it separately
-#@define HELLO="Hello"
+@define HELLO="Hello"
 
 @lib
   f1 () {
-# TODO found one other bug, but let's fix it separately
-    #echo "$HELLO $1"
-    echo "Hello $1"
+    echo "$HELLO $1"
   }
 
 @goal g1

diff --git a/tests/4_trace.tush b/tests/4_trace.tush
@@ -8,14 +8,12 @@ $ cd "$MYDIR"; ./$MAKESURE -f tests/4_trace.sh -x
 | A=aaa
 @ + A=aaa
 @ + export A
-@ + echo ' A=aaa; export A'
 @ + echo A=aaa
 
 $ cd "$MYDIR"; ./$MAKESURE -f tests/4_trace.sh --tracing
 |   goal 'default' ...
 | A=aaa
 @ + A=aaa
 @ + export A
-@ + echo ' A=aaa; export A'
 @ + echo A=aaa