Killall command not available in Circle

Author: devversion

scripts/browserstack/start-tunnel.sh

@@ -38,6 +38,8 @@ echo "Starting Browserstack Local in the background, logging into: ${tunnelLogFi
 
 # Extension to the BrowserStackLocal binaries, because those can't create a readyfile.
 function create_ready_file {
+  # Process ID for the BrowserStack local asynchronous instance.
+  tunnelProcessPid=${1}
 
   # To be able to exit the tail properly we need to have a sub shell spawned, which is
   # used to track the state of tail.
@@ -57,11 +59,12 @@ function create_ready_file {
   echo
   echo "BrowserStack Tunnel ready"
 
-  touch ${tunnelReadyFile}
+  # Create the readyfile and write the PID for BrowserStack Local into it.
+  echo ${tunnelProcessPid} > ${tunnelReadyFile}
 }
 
 browserstack-tunnel/BrowserStackLocal -k ${BROWSER_STACK_ACCESS_KEY} ${ARGS} 2>&1 >> \
   ${tunnelLogFile} &
 
 # Wait for the tunnel to be ready and create the readyfile with the Browserstack PID
-create_ready_file &
+create_ready_file ${!} &

scripts/browserstack/stop-tunnel.sh

@@ -2,11 +2,24 @@
 
 set -e -o pipefail
 
-echo "Shutting down Browserstack tunnel"
+tunnelTmpDir="/tmp/material-browserstack"
+tunnelReadyFile="${tunnelTmpDir}/readyfile"
 
-killall BrowserStackLocal
+if [[ ! -f ${tunnelReadyFile} ]]; then
+  echo "BrowserStack tunnel has not been started. Cannot stop tunnel.."
+  exit 1
+fi
 
-while [[ -n `ps -ef | grep "BrowserStackLocal" | grep -v "grep"` ]]; do
+echo "Shutting down Browserstack tunnel.."
+
+# The process id for the BrowserStack local instance is stored inside of the readyfile.
+tunnelProcessId=$(cat ${tunnelReadyFile})
+
+# Kill the process by reading the PID from the readyfile. Note that we cannot
+# use killall because CircleCI base container images don't have it installed.
+kill ${tunnelProcessId}
+
+while (ps -p ${tunnelProcessId} &> /dev/null); do
   printf "."
   sleep .5
 done