From d940ac4ce3f8397518b7a46df5c0a7f91661a7e9 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Thu, 18 Apr 2019 06:33:08 -0600 Subject: [PATCH] Look for binaries on the user's `$PATH` shell and terminal binaries aren't always in /usr/bin, and scripts are more portable if they don't hardcode paths. This replaces absolute paths with lookups from the user's `$PATH`. For details, see https://unix.stackexchange.com/questions/29608/ --- dw-start.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dw-start.sh b/dw-start.sh index 360b9c7..0f3b831 100755 --- a/dw-start.sh +++ b/dw-start.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Run this from crontab periodically to start up # Dire Wolf automatically. @@ -120,14 +120,14 @@ function GUI { # Auto adjust the startup for your particular environment: gnome-terminal, xterm, etc. # - if [ -x /usr/bin/lxterminal ]; then - /usr/bin/lxterminal -t "Dire Wolf" -e "$DWCMD" & + if $(which lxterminal &> /dev/null); then + lxterminal -t "Dire Wolf" -e "$DWCMD" & SUCCESS=1 - elif [ -x /usr/bin/xterm ]; then - /usr/bin/xterm -bg white -fg black -e "$DWCMD" & + elif $(which xterm &> /dev/null); then + xterm -bg white -fg black -e "$DWCMD" & SUCCESS=1 - elif [ -x /usr/bin/x-terminal-emulator ]; then - /usr/bin/x-terminal-emulator -e "$DWCMD" & + elif $(which x-terminal-emulator &> /dev/null); then + x-terminal-emulator -e "$DWCMD" & SUCCESS=1 else echo "Did not find an X terminal emulator. Reverting to CLI mode"