moved FIVEUI_ROOT/bin to FIVEUI_ROOT/headless/bin and updated references in docs

4 files changed, 14 insertions, 14 deletions

diff --git a/bin/runHeadless.sh b/bin/runHeadless.sh
deleted file mode 100755
index 68842b1..0000000
--- a/bin/runHeadless.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-export FIVEUI_ROOT_PATH=$HOME/FiveUI
-export FIREFOX_BIN_PATH=/usr/bin/firefox
-
-java -DFIVEUI_ROOT_PATH=$FIVEUI_ROOT_PATH \
-     -DFIREFOX_BIN_PATH=$FIREFOX_BIN_PATH \
-     -jar $FIVEUI_ROOT_PATH/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar \
-     $*
diff --git a/doc/manual_src/headlessFiveUI.md b/doc/manual_src/headlessFiveUI.md
index c65088b..78f7a2d 100644
--- a/doc/manual_src/headlessFiveUI.md
+++ b/doc/manual_src/headlessFiveUI.md
@@ -92,12 +92,12 @@ that you have to `<FiveUI>/profiles/firefox`.
 
 ### Edit the run script
 
-Edit variables at the start of `<FiveUI>/bin/runHeadless.sh` to
+Edit variables at the start of `<FiveUI>/headless/bin/runHeadless.sh` to
 reflect your Firefox installation and FiveUI installation directory.
 
 ```
-$ cd <FiveUI>
-$ cat bin/runHeadless.sh
+$ cd <FiveUI>/headless/bin
+$ cat runHeadless.sh
 export FIVEUI_ROOT_PATH=$HOME/galois/FiveUI
 export FIREFOX_BIN_PATH=$HOME/myapps/Firefox17/Contents/MacOS/firefox
 ...
@@ -108,8 +108,8 @@ export FIREFOX_BIN_PATH=$HOME/myapps/Firefox17/Contents/MacOS/firefox
 The `runHeadless.sh` script can be invoked from the command line with options.
 
 ```
-$ cd <FiveUI>
-$ bin/runHeadless.sh -h
+$ cd <FiveUI>/headless/bin
+$ ./runHeadless.sh -h
 usage: headless <input file 1> [<input file 2> ...]
  -h                      print this help message
  -o <outfile>            write output to file
@@ -133,7 +133,7 @@ $ mkdir -p reports/basic
 Now invoke the `runHeadless` script.
 
 ```
-$ <FiveUI>/bin/runHeadless.sh basicRun.json -v -o reports/basic.out -r reports/basic
+$ <FiveUI>/headless/bin/runHeadless.sh basicRun.json -v -o reports/basic.out -r reports/basic
 ```
 
 You should see the Firefox browser open and load `http://whitehouse.gov`. The FiveUI
diff --git a/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar b/headless/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar
index e9cc6dc..2c9219d 100644
--- a/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar
+++ b/headless/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar
diff --git a/headless/bin/runHeadless.sh b/headless/bin/runHeadless.sh
new file mode 100755
index 0000000..4c4d863
--- /dev/null
+++ b/headless/bin/runHeadless.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+export FIVEUI_ROOT_PATH=$HOME/FiveUI
+export FIREFOX_BIN_PATH=/Users/bjones/myapps/Firefox_17_esr.app/Contents/MacOS/firefox
+
+java -DFIVEUI_ROOT_PATH=$FIVEUI_ROOT_PATH \
+     -DFIREFOX_BIN_PATH=$FIREFOX_BIN_PATH \
+     -jar $FIVEUI_ROOT_PATH/headless/bin/HeadlessRunner-0.0.1-SNAPSHOT.one-jar.jar \
+     $*