|
|
@@ -34,6 +34,7 @@ checksum_path="$CHECKSUM_AND_VERSION_PATH"
|
|
|
|
|
|
function spawn_supervisor
|
|
|
{
|
|
|
+
|
|
|
# If we have a client supervisor binary to run
|
|
|
#
|
|
|
if [ -f $BASEDIR/bin/client_supervisor ]; then
|
|
|
@@ -57,7 +58,10 @@ function spawn_supervisor
|
|
|
# fi
|
|
|
|
|
|
|
|
|
- rm $supervisor_pidfile
|
|
|
+ # If we've gotten here, the client_supervisor process should
|
|
|
+ # be running or is stale, so cleanup and respawn
|
|
|
+ #
|
|
|
+ rm -f $supervisor_pidfile
|
|
|
|
|
|
# then run the whole shebang...
|
|
|
#
|
|
|
@@ -74,8 +78,6 @@ function spawn_supervisor
|
|
|
rm -f $BASEDIR/config/*.tgz.*
|
|
|
$BASEDIR/bin/showmessage -b "Wait (~ 15 min)"
|
|
|
|
|
|
- echo "..."
|
|
|
-
|
|
|
fi
|
|
|
}
|
|
|
|
|
|
@@ -94,7 +96,7 @@ function check_update
|
|
|
echo -en "\t`echo $file | sed -r 's/^.*\/(.*)\.checksum$/\1/'`=`cat $file`";
|
|
|
done;
|
|
|
echo;
|
|
|
- ) | nc localhost $UPDATE_DAEMON_PORT
|
|
|
+ ) | nc -q1 localhost $UPDATE_DAEMON_PORT
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -119,6 +121,10 @@ while true; do
|
|
|
(
|
|
|
while read client_file checksum file_size server_path file_version; do
|
|
|
|
|
|
+ ## DEBUG
|
|
|
+ echo "# UPDATES DISABLED TEMPORARILY"
|
|
|
+ break;
|
|
|
+
|
|
|
# If we've been asked to abort this update, do so before we start downloading if possible
|
|
|
#
|
|
|
if [ -f $UPDATE_ABORT_DROPFILE ]; then
|