diff --git a/release/remote_install.sh b/release/remote_install.sh index 34ea47e..81d56b6 100755 --- a/release/remote_install.sh +++ b/release/remote_install.sh @@ -33,15 +33,30 @@ FROM_CURL=$FASE # Remember not to use (check for terminal, as it may not exist when pipe to bash) # ie. if [ -t 0 ]; then -if command -v "systemd-cat" &>/dev/null; then SYSTEMD_LOG=$TRUE;fi +# We can get called from no path, so find external commands +if command -v "systemd-cat" &>/dev/null; then + SYSTEMD_CAT="systemd-cat" + SYSTEMD_LOG=$TRUE +elif command -v "/usr/bin/systemd-cat" &>/dev/null; then + SYSTEMD_CAT="/usr/bin/systemd-cat" + SYSTEMD_LOG=$TRUE +fi + +if command -v "logger" &>/dev/null; then + LOGGER="logger" +elif command -v "/usr/bin/logger" &>/dev/null; then + LOGGER="/usr/bin/logger" +fi + + log() { echo "$*" if [[ $SYSTEMD_LOG -eq $TRUE ]]; then - echo "Upgrade: $*" | systemd-cat -t aqualinkd -p info + echo "Upgrade: $*" | $SYSTEMD_CAT -t aqualinkd -p info else - logger -p local0.notice -t aqualinkd "Upgrade: $*" + $LOGGER -p local0.notice -t aqualinkd "Upgrade: $*" fi echo "$*" 2>/dev/null >> "$OUTPUT" } @@ -51,9 +66,9 @@ logerr() echo "Error: $*" >&2 if [[ $SYSTEMD_LOG -eq $TRUE ]]; then - echo "Upgrade: $*" | systemd-cat -t aqualinkd -p err + echo "Upgrade: $*" | $SYSTEMD_CAT -t aqualinkd -p err else - logger -p local0.error -t aqualinkd "Upgrade: $*" + $LOGGER -p local0.error -t aqualinkd "Upgrade: $*" fi echo "ERROR: $*" 2>/dev/null >> "$OUTPUT"