Skip to content

Commit

Permalink
* Some minor fix reported by Remi Lacroix
Browse files Browse the repository at this point in the history
  • Loading branch information
svalat committed Jul 29, 2015
1 parent 0eeb396 commit 129792c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
12 changes: 11 additions & 1 deletion src/integration/malt-webserver.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,19 @@ detectNodeJS()
#check node
detectNodeJS

######################################################
#check if have --no-auth
HAVE_NO_AUTH="false"
for arg in "$@"
do
if [ "${arg}" == "--no-auth" ]; then
HAVE_NO_AUTH="true"
fi
done

######################################################
#Check passwod file
if [ ! -f $HOME/.malt.passwd ]; then
if [ ! -f "${HOME}/.malt/passwd" ] && [ "$HAVE_NO_AUTH" == "false" ]; then
echo "!!! You need to setup a user/password to secure access to the web GUI !!!"
printf "User : "
read user
Expand Down
4 changes: 2 additions & 2 deletions src/webview/client-files/app/partials/help.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ <h1>Profiling</h1>

<h1>Use of the GUI</h1>

<p>To launch this GUI, you just have to use the <code>malt-webview</code> command :</p>
<p>To launch this GUI, you just have to use the <code>malt-webserver</code> command :</p>

<pre>malt-webview -i malt-my_program-12589.json [-p PORT]</pre>
<pre>malt-webserver -i malt-my_program-12589.json [-p PORT]</pre>

<p>It opens a webserver on port 8080 by default so you can open it with your browser by going to <a href='http://localhost:8080'>http://localhost:8080</a>.
If you run it remotly, you might need to forward the port through SSH by using command : </p>
Expand Down
2 changes: 1 addition & 1 deletion src/webview/malt-webserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var maltCache = new Object();

/****************************************************/
//Manage args
args = new Args('malt-webview', '1.0', 'Webiew for MALT based on Node.js','');
args = new Args('malt-webserver', '1.0', 'Webiew for MALT based on Node.js','');
//define args
args.add({ name: 'input', desc: 'input file from MALT into JSON format', switches: [ '-i', '--input-file'], value: 'file', required: true });
args.add({ name: 'port', desc: 'Port to use to wait for HTTP requests', switches: [ '-p', '--port'], value: 'port', required: false });
Expand Down

0 comments on commit 129792c

Please sign in to comment.