mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-09-18 10:23:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tools): allow spaces in workspace path for op.sh (#38839)

Browse Source
This commit is contained in:
David
2026-09-12 16:06:20 -05:00
committed by GitHub
parent f1ba169fb5
commit 5cad99bf7a
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/op.sh
+16 -16
View File
@@ -73,11 +73,11 @@ function op_get_openpilot_dir() {
function op_install_post_commit() {
op_get_openpilot_dir
if [[ ! -d $OPENPILOT_ROOT/.git/hooks/post-commit.d ]]; then
mkdir $OPENPILOT_ROOT/.git/hooks/post-commit.d
mv $OPENPILOT_ROOT/.git/hooks/post-commit $OPENPILOT_ROOT/.git/hooks/post-commit.d 2>/dev/null || true
if [[ ! -d "$OPENPILOT_ROOT/.git/hooks/post-commit.d" ]]; then
mkdir "$OPENPILOT_ROOT/.git/hooks/post-commit.d"
mv "$OPENPILOT_ROOT/.git/hooks/post-commit" "$OPENPILOT_ROOT/.git/hooks/post-commit.d" 2>/dev/null || true
fi
cd $OPENPILOT_ROOT/.git/hooks
cd "$OPENPILOT_ROOT/.git/hooks"
ln -sf ../../scripts/post-commit post-commit
}
@@ -103,7 +103,7 @@ function op_check_git() {
fi
echo "Checking for git lfs files..."
if [[ $(file -b $OPENPILOT_ROOT/openpilot/selfdrive/modeld/models/dmonitoring_model.onnx) == "data" ]]; then
if [[ $(file -b "$OPENPILOT_ROOT/openpilot/selfdrive/modeld/models/dmonitoring_model.onnx") == "data" ]]; then
echo -e " ↳ [${GREEN}✔${NC}] git lfs files found."
else
echo -e " ↳ [${RED}✗${NC}] git lfs files not found! Run 'git lfs pull'"
@@ -112,7 +112,7 @@ function op_check_git() {
echo "Checking for git submodules..."
for name in $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | tr '\n' ' '); do
if [[ -z $(ls $OPENPILOT_ROOT/$name) ]]; then
if [[ -z $(ls "$OPENPILOT_ROOT/$name") ]]; then
echo -e " ↳ [${RED}✗${NC}] git submodule $name not found! Run 'git submodule update --init --recursive'"
return 1
fi
@@ -134,10 +134,10 @@ function op_check_os() {
function op_check_venv() {
echo "Checking for venv..."
if [[ -f $OPENPILOT_ROOT/.venv/bin/activate ]]; then
if [[ -f "$OPENPILOT_ROOT/.venv/bin/activate" ]]; then
echo -e " ↳ [${GREEN}✔${NC}] venv detected."
else
echo -e " ↳ [${RED}✗${NC}] Can't activate venv in $OPENPILOT_ROOT. Assuming global env!"
echo -e " ↳ [${RED}✗${NC}] Can't activate venv in '$OPENPILOT_ROOT'. Assuming global env!"
fi
}
@@ -147,7 +147,7 @@ function op_before_cmd() {
fi
op_get_openpilot_dir
cd $OPENPILOT_ROOT
cd "$OPENPILOT_ROOT"
result="$((op_check_openpilot_dir ) 2>&1)" || (echo -e "$result" && return 1)
result="${result}\n$(( op_check_git ) 2>&1)" || (echo -e "$result" && return 1)
@@ -176,7 +176,7 @@ EOF
echo -e " ↳ [${GREEN}✔${NC}] op installed successfully. Open a new shell to use it."
op_get_openpilot_dir
cd $OPENPILOT_ROOT
cd "$OPENPILOT_ROOT"
op_check_openpilot_dir
op_check_os
@@ -195,7 +195,7 @@ EOF
echo "Installing dependencies..."
st="$(date +%s)"
SETUP_SCRIPT="tools/setup_dependencies.sh"
if ! $OPENPILOT_ROOT/$SETUP_SCRIPT; then
if ! "$OPENPILOT_ROOT/$SETUP_SCRIPT"; then
echo -e " ↳ [${RED}✗${NC}] Dependencies installation failed!"
return 1
fi
@@ -230,7 +230,7 @@ function op_auth() {
function op_activate_venv() {
# bash 3.2 can't handle this without the 'set +e'
set +e
source $OPENPILOT_ROOT/.venv/bin/activate &> /dev/null || true
source "$OPENPILOT_ROOT/.venv/bin/activate" &> /dev/null || true
set -e
# persist venv on PATH across GitHub Actions steps
@@ -242,18 +242,18 @@ function op_activate_venv() {
function op_venv() {
op_before_cmd
if [[ ! -f $OPENPILOT_ROOT/.venv/bin/activate ]]; then
echo -e "No venv found in $OPENPILOT_ROOT"
if [[ ! -f "$OPENPILOT_ROOT/.venv/bin/activate" ]]; then
echo -e "No venv found in '$OPENPILOT_ROOT'"
return 1
fi
case $SHELL_NAME in
"zsh")
ZSHRC_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'tmp_zsh')
echo "source $RC_FILE; source $OPENPILOT_ROOT/.venv/bin/activate" >> $ZSHRC_DIR/.zshrc
echo "source \"$RC_FILE\"; source \"$OPENPILOT_ROOT/.venv/bin/activate\"" >> $ZSHRC_DIR/.zshrc
ZDOTDIR=$ZSHRC_DIR zsh ;;
*)
bash --rcfile <(echo "source $RC_FILE; source $OPENPILOT_ROOT/.venv/bin/activate") ;;
bash --rcfile <(echo "source \"$RC_FILE\"; source \"$OPENPILOT_ROOT/.venv/bin/activate\"") ;;
esac
}