Exit from stop.sh with an error if curl isn't installed. Based on code submitted by TRM13 in issue #28.

This commit is contained in:
CalDescent 2021-02-12 16:13:01 +00:00
parent dc6eda1355
commit 02100c502b

39
stop.sh
View File

@ -21,21 +21,32 @@ fi
read pid 2>/dev/null <run.pid read pid 2>/dev/null <run.pid
is_pid_valid=$? is_pid_valid=$?
echo 'Calling GET /admin/stop on local Qortal node' # Ensure curl is installed
if curl --url http://localhost:12391/admin/stop 1>/dev/null 2>&1; then curl_path=$(which curl)
echo "Qortal node responded and should be shutting down"
if [ "${is_pid_valid}" -eq 0 ]; then if [[ -f $curl_path ]]; then
echo -n "Monitoring for Qortal node to end"
while s=`ps -p $pid -o stat=` && [[ "$s" && "$s" != 'Z' ]]; do echo 'Calling GET /admin/stop on local Qortal node'
echo -n . if curl --url http://localhost:12391/admin/stop 1>/dev/null 2>&1; then
sleep 1 echo "Qortal node responded and should be shutting down"
done
echo if [ "${is_pid_valid}" -eq 0 ]; then
echo "${green}Qortal ended gracefully${normal}" echo -n "Monitoring for Qortal node to end"
rm -f run.pid while s=`ps -p $pid -o stat=` && [[ "$s" && "$s" != 'Z' ]]; do
echo -n .
sleep 1
done
echo
echo "${green}Qortal ended gracefully${normal}"
rm -f run.pid
fi
exit 0
else
echo "${red}No response from Qortal node - not running?${normal}"
exit 1
fi fi
exit 0
else else
echo "${red}No response from Qortal node - not running?${normal}" echo "${red}curl is not installed or in the path${normal}"
exit 1 exit 1
fi fi