sfeakes
/
AqualinkD
mirror of https://github.com/sfeakes/AqualinkD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update

pull/428/head
sfeakes 2025-05-04 16:29:35 -05:00
parent 32c292dd77
commit 95f9d7c20c
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
release/remote_install.sh
View File

@ -29,35 +29,27 @@ TEMP_INSTALL="/tmp/aqualinkd"
OUTPUT="/tmp/aqualinkd_upgrade.log"
FROM_CURL=$FASE
SYSTEMD_LOG=$FALSE
# Remember not to use (check for terminal, as it may not exist when pipe to bash)
# ie. if [ -t 0 ]; then
# 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
if [ "$SYSTEMD_LOG" -eq $TRUE ]; then
echo "Upgrade: $*" | systemd-cat -t aqualinkd -p info &>> "$OUTPUT"
else
$LOGGER -p local0.notice -t aqualinkd "Upgrade: $*"
logger -p local0.notice -t aqualinkd "Upgrade: $*"
fi
echo "$*" 2>/dev/null >> "$OUTPUT"
}
@ -65,10 +57,13 @@ logerr()
{
echo "Error: $*" >&2
if [[ $SYSTEMD_LOG -eq $TRUE ]]; then
echo "Upgrade: $*" | $SYSTEMD_CAT -t aqualinkd -p err
logger -p local0.err -t aqualinkd "Upgrade1: $*" &>> "$OUTPUT"
if [ "$SYSTEMD_LOG" -eq $TRUE ]; then
# For some unknown reason, only way below works from aqualinkd process is adding "&>> "$OUTPUT""
echo "Upgrade: $*" | systemd-cat -t aqualinkd -p err &>> "$OUTPUT"
else
$LOGGER -p local0.error -t aqualinkd "Upgrade: $*"
logger -p local0.err -t aqualinkd "Upgrade: $*"
fi
echo "ERROR: $*" 2>/dev/null >> "$OUTPUT"

1
source/aq_systemutils.c
View File

@ -140,7 +140,6 @@ bool run_aqualinkd_upgrade(bool onlycheck)
int pipe_curl_to_bash[2];
pid_t pid_curl, pid_bash;
//char *curl_args[] = {"curl", "-fsSl", "http://tiger/scratch/remote_install.sh", NULL};
//char *curl_args[] = {"curl", "-fsSl", "-H", "Accept: application/vnd.github.raw", "https://api.github.com/repos/sfeakes/AqualinkD/contents/release/remote_install.sh", NULL};
char *curl_args[] = {"curl", "-fsSl", "-H", "Accept: application/vnd.github.raw", "https://api.github.com/repos/AqualinkD/AqualinkD/contents/release/remote_install.sh", NULL};
char *bash_args[] = {"bash", "-s", "--", "check", NULL};
int status_curl, status_bash;