BASEDIR -> DIR

pull/34832/head
Adeeb Shihadeh 2 months ago
parent 5574b91d17
commit f870e48b3a
  1. 16
      launch_chffrplus.sh

@ -34,25 +34,25 @@ function launch {
# Check to see if there's a valid overlay-based update available. Conditions # Check to see if there's a valid overlay-based update available. Conditions
# are as follows: # are as follows:
# #
# 1. The BASEDIR init file has to exist, with a newer modtime than anything in # 1. The DIR init file has to exist, with a newer modtime than anything in
# the BASEDIR Git repo. This checks for local development work or the user # the DIR Git repo. This checks for local development work or the user
# switching branches/forks, which should not be overwritten. # switching branches/forks, which should not be overwritten.
# 2. The FINALIZED consistent file has to exist, indicating there's an update # 2. The FINALIZED consistent file has to exist, indicating there's an update
# that completed successfully and synced to disk. # that completed successfully and synced to disk.
if [ -f "${BASEDIR}/.overlay_init" ]; then if [ -f "${DIR}/.overlay_init" ]; then
find ${BASEDIR}/.git -newer ${BASEDIR}/.overlay_init | grep -q '.' 2> /dev/null find ${DIR}/.git -newer ${DIR}/.overlay_init | grep -q '.' 2> /dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "${BASEDIR} has been modified, skipping overlay update installation" echo "${DIR} has been modified, skipping overlay update installation"
else else
if [ -f "${STAGING_ROOT}/finalized/.overlay_consistent" ]; then if [ -f "${STAGING_ROOT}/finalized/.overlay_consistent" ]; then
if [ ! -d /data/safe_staging/old_openpilot ]; then if [ ! -d /data/safe_staging/old_openpilot ]; then
echo "Valid overlay update found, installing" echo "Valid overlay update found, installing"
LAUNCHER_LOCATION="${BASH_SOURCE[0]}" LAUNCHER_LOCATION="${BASH_SOURCE[0]}"
mv $BASEDIR /data/safe_staging/old_openpilot mv $DIR /data/safe_staging/old_openpilot
mv "${STAGING_ROOT}/finalized" $BASEDIR mv "${STAGING_ROOT}/finalized" $DIR
cd $BASEDIR cd $DIR
echo "Restarting launch script ${LAUNCHER_LOCATION}" echo "Restarting launch script ${LAUNCHER_LOCATION}"
unset AGNOS_VERSION unset AGNOS_VERSION

Loading…
Cancel
Save