From d254137f4c5b9d188d15f21dc2c767197472f357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20R=C4=85czy?= Date: Fri, 25 Aug 2023 18:56:06 -0700 Subject: [PATCH] modeld: fix bash scripts (#29643) Fix shebang. Fix LD_PRELOAD old-commit-hash: a4a0429fca82a79118238695a04d888498ca0376 --- selfdrive/modeld/dmonitoringmodeld | 2 +- selfdrive/modeld/modeld | 7 +++++-- selfdrive/modeld/navmodeld | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/selfdrive/modeld/dmonitoringmodeld b/selfdrive/modeld/dmonitoringmodeld index f292fe4c0b..fc007470b2 100755 --- a/selfdrive/modeld/dmonitoringmodeld +++ b/selfdrive/modeld/dmonitoringmodeld @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" cd $DIR diff --git a/selfdrive/modeld/modeld b/selfdrive/modeld/modeld index 7c1025a72f..14048ec9fd 100755 --- a/selfdrive/modeld/modeld +++ b/selfdrive/modeld/modeld @@ -1,7 +1,10 @@ -#!/bin/sh +#!/usr/bin/env bash DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" cd "$DIR/../../" -export LD_PRELOAD="$DIR/libthneed.so" +if [ -f "$DIR/libthneed.so" ]; then + export LD_PRELOAD="$DIR/libthneed.so" +fi + exec "$DIR/modeld.py" diff --git a/selfdrive/modeld/navmodeld b/selfdrive/modeld/navmodeld index 079afd9677..58215c2e9d 100755 --- a/selfdrive/modeld/navmodeld +++ b/selfdrive/modeld/navmodeld @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" cd $DIR