""

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@660 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
erlyaws · Mar 22, 2004 · 6c84378 · 6c84378
1 parent 9ce9a25
commit 6c84378
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/scripts/yaws.template b/scripts/yaws.template
@@ -119,6 +119,7 @@ do
 	        $erl -noshell -pa ${yawsdir}${delim}ebin -s yaws_ctl load ${id} $*
 		exit 0;;
 	   -j)
+	        id=$1
 	        ex="$erl -noshell -pa ${yawsdir}${delim}ebin -s yaws_ctl trace $1"
 		shift;;
 	   -v) 
@@ -130,10 +131,9 @@ do
            -heart)
 		heart=" -heart ";;
            -check)
-                ID=`id -u`
 		mkdir /tmp/yaws 2> /dev/null
 	        mkdir /tmp/yaws/${ID} 2> /dev/null
-                out=`exec $erl -noshell -pa ${yawsdir}${delim}ebin ${xpath} -s yaws_ctl check $*`
+                out=`exec $erl -noshell -pa ${yawsdir}${delim}ebin ${xpath} -s yaws_ctl check ${id} $*`
 		if [ "$out" = "ok" ]; then
                     echo "$1" ok
 		    exit 0

diff --git a/src/yaws_ctl.erl b/src/yaws_ctl.erl
@@ -355,10 +355,12 @@ load(X) ->
     [SID | Modules] = lists:reverse(X),
     actl(SID, {load, Modules}).
 
-check([File| IncludeDirs]) ->
+check([Id, File| IncludeDirs]) ->
     GC = yaws_config:make_default_gconf(false),
     GC2 = GC#gconf{include_dir = lists:map(fun(X) -> atom_to_list(X) end, 
-					   IncludeDirs)},
+					   IncludeDirs),
+		   id = atom_to_list(Id)
+		  },
     put(sc, #sconf{}),
     put(gc, GC2),
     case yaws_compile:compile_file(atom_to_list(File)) of