more fixes, updated README

Author: edmondscommerce

.gitignore

@@ -1,2 +1,3 @@
 /vendor/
-.idea/
+.idea/
+nohup.out

README.md

@@ -1,2 +1,43 @@
 # selenium-server
-selenium-server
+
+This is a simple package to easily run Selenium with Chrome driver.
+
+It does not contain the binaries, instead it will download them on first run.
+
+It has only been run and tested on Linux.
+
+To install it simply add 
+
+`"edmondscommerce/selenium-server": "~1"`
+
+To your composer.json file and then run composer update
+
+
+## Running
+
+`bin/selenium-run.bash` To run Selenium in a terminal. You can stop the Selenium process as required by hitting [ctrl]+[c]
+
+## Running in the background
+
+`bin/selenium-background-run.bash`
+
+This will run the process in the background using nohup
+
+## Stopping the background process
+
+`bin/selenium-stop.bash`
+
+This will find a Selenium process that is running in the background and kill it
+
+
+## Firefox / Chrome
+
+This process uses Chrome by default.
+
+If you want to use it with Firefox, you need to append the `firefox` flag, eg
+
+`bin/selenium-run.bash firefox`
+
+Or
+
+`bin/selenium-background-run.bash firefox`

bin/selenium-background-run.bash

@@ -6,10 +6,11 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
   [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+cd $DIR
 
 echo '' > nohup.out
-nohup $DIR/selenium-run.bash "$@" &
-sleep 1
+nohup ./selenium-run.bash "$@" &
+sleep 2
 
 cat nohup.out
 echo "

bin/selenium-run.bash

@@ -1,4 +1,13 @@
 #!/bin/bash
+#set -x
+
+MAJOR_VERSION=2.44
+VERSION=${MAJOR_VERSION}.0
+JAR_FILE=selenium-server-standalone-${VERSION}.jar
+
+CHROMEDRIVER_VERSION=2.14
+CHROMEDRIVER_FILE=chromedriver-${CHROMEDRIVER_VERSION}
+
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
   DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@@ -12,12 +21,7 @@ then
     echo "Failed cd-ing into the the binaries folder, aborting"
     exit 1
 fi
-MAJOR_VERSION=2.44
-VERSION=${MAJOR_VERSION}.0
-JAR_FILE=selenium-server-standalone-${VERSION}.jar
 
-CHROMEDRIVER_VERSION=2.14
-CHROMEDRIVER_FILE=chromedriver-${CHROMEDRIVER_VERSION}
 
 ## Host File bug sanity check
 grep '127.0.0.1 localhost' /etc/hosts > /dev/null
@@ -77,17 +81,8 @@ fi
 
 echo "Starting Selenium"
 
-echo "Checking if already running:"
-h=$(pgrep -f selenium-server)
-if [[ -n $h ]]; then
-    echo "found running instance, killing that now"
-    kill $h
-    while [[ -n $h ]]; do
-        sleep 1
-        h=$(pgrep -f selenium-server)
-    done
-fi
-echo "done"
+echo "Killing if already running:"
+source $DIR/selenium-stop.bash
 
 
 if [[ "$@" =~ .*firefox.* ]]

bin/selenium-stop.bash

@@ -1,10 +1,15 @@
 #!/bin/bash
-SELENIUM_PID=$(pgrep -f selenium-server)
-if [[ "" == "$SELENIUM_PID" ]]
-then
-    echo "No Selenium process found"
-else
-    echo "Killing PID $SELENIUM_PID"
-    kill $SELENIUM_PID
+SELENIUM_PROCESS_GREP=selenium-server-standalone
+
+h=$(pgrep -f ${SELENIUM_PROCESS_GREP} )
+if [[ -n $h ]]; then
+    echo "Killing PID $h"
+    kill $h
+    while [[ -n $h ]]; do
+        sleep 1
+        h=$(pgrep -f ${SELENIUM_PROCESS_GREP} )
+    done
     echo "done"
+else
+    echo "No Selenium process found"
 fi