Skip to content

Fix quoting in run.sh #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diffstorm merged 1 commit into from
Mar 31, 2025
Merged

Fix quoting in run.sh #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 31 additions & 27 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,27 @@
# processWatchdog application start, watchdog and report script
# Copyright (c) 2023 Eray Ozturk <erayozturk1@gmail.com>

homedir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
homedir=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
app=processWatchdog
ini=config.ini
countf=crash_count
logf=crash_log
RET=1
CURRENTDATE=$(date +"%d-%m-%Y %T")

export _JAVA_OPTIONS=-Duser.home=${homedir}
export _JAVA_OPTIONS="-Duser.home=${homedir}"

logrotate()
logrotate()
{
echo "$(tail -1000 ${homedir}/${logf})" > ${homedir}/${logf}
# Truncate log file to last 1000 lines
tail -1000 "${homedir}/${logf}" > "${homedir}/${logf}.tmp"
mv "${homedir}/${logf}.tmp" "${homedir}/${logf}"
}

exit_normally()
{
msg="$0 exited normally at ${CURRENTDATE}"
echo "$msg" >> ${homedir}/${logf}
echo "$msg" >> "${homedir}/${logf}"
logrotate
echo "$msg"
RET=0 # exit
Expand All @@ -31,19 +33,22 @@ exit_crashed()
{
count=0
if [[ -f "${homedir}/${countf}" ]]; then
count=$(cat ${homedir}/${countf})
count=$(cat "${homedir}/${countf}")
fi
echo "$(($count+1))" > ${homedir}/$countf
msg="$0 crashed with return code [$1] at ${CURRENTDATE} [$(cat ${homedir}/${countf})]"
echo "$((count + 1))" > "${homedir}/${countf}"
msg="$0 crashed with return code [$1] at ${CURRENTDATE} [$(cat "${homedir}/${countf}")]"
echo "$msg"
df -h
output=$(echo "$msg" >> ${homedir}/${logf})

# Capture both stdout and stderr when writing to log
output=$(echo "$msg" >> "${homedir}/${logf}" 2>&1)
ret=$?
logrotate

errspace='No space left on device'
if [[ "$output" == *"$errspace"* ]]; then
if [[ $ret -ne 0 && "$output" == *"$errspace"* ]]; then
echo "error: $errspace"
#${homedir}/reset_system.sh & # TODO:
break
# "${homedir}/reset_system.sh" &
fi
RET=1 # re-run the app
}
Expand All @@ -52,7 +57,7 @@ exit_restart()
{
msg="$0 exited to be restarted at ${CURRENTDATE}"
echo "$msg"
echo "$msg" >> ${homedir}/${logf}
echo "$msg" >> "${homedir}/${logf}"
logrotate
RET=1 # re-run the app
}
Expand All @@ -61,7 +66,7 @@ exit_reboot()
{
msg="$0 exited normally to reboot system at ${CURRENTDATE}"
echo "$msg"
echo "$msg" >> ${homedir}/${logf}
echo "$msg" >> "${homedir}/${logf}"
logrotate
RET=0 # exit
(sleep 2; reboot) &
Expand All @@ -70,32 +75,31 @@ exit_reboot()

# Check if a kill parameter is provided
if [ "$1" == "kill" ]; then
process_pid=$(pidof ${app})
process_pid=$(pidof "${app}")
if [ -z "$process_pid" ]; then
echo "Could not find the process ID of $app"
exit 1
echo "Could not find the process ID of $app"
exit 1
fi
process_name=$(ps -p $process_pid -o comm=)
process_name=$(ps -p "$process_pid" -o comm=)
echo "Sending USR1 signal to $process_name (PID: $process_pid)"
kill -SIGUSR1 $process_pid
kill -SIGUSR1 "$process_pid"
exit 0
fi

echo "Starting $0"

while :
do
chmod +x ${homedir}/${app}
${homedir}/${app} -i ${homedir}/${ini}
while :; do
chmod +x "${homedir}/${app}"
"${homedir}/${app}" -i "${homedir}/${ini}"
RET_CODE=$?
CURRENTDATE=$(date +"%d-%m-%Y %T")

RET=1
case $RET_CODE in
0) exit_normally;;
2) exit_restart;;
3) exit_reboot;;
*) exit_crashed $RET_CODE;;
0) exit_normally ;;
2) exit_restart ;;
3) exit_reboot ;;
*) exit_crashed "$RET_CODE" ;;
esac

if [[ $RET -eq 0 ]]; then
Expand Down