diff --git a/.gitignore b/.gitignore index 4889c6b..10b8a32 100755 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ prebuilt system/clearpilot/dev/on_start_brian.sh system/clearpilot/dev/id_rsa system/clearpilot/dev/id_rsa.pub +system/clearpilot/dev/id_ed25519 +system/clearpilot/dev/id_ed25519.pub venv/ .venv/ .ci_cache diff --git a/system/clearpilot/on_start.sh b/system/clearpilot/on_start.sh index 3fe4566..98d1579 100755 --- a/system/clearpilot/on_start.sh +++ b/system/clearpilot/on_start.sh @@ -14,5 +14,5 @@ nmcli radio wifi on 2>/dev/null # Provision (packages, git pull, build) if no quick_boot flag if [ ! -f /data/quick_boot ]; then - bash /data/openpilot/system/clearpilot/provision.sh + sudo bash /data/openpilot/system/clearpilot/provision.sh fi diff --git a/system/clearpilot/provision.sh b/system/clearpilot/provision.sh index 39ef21c..38f4c43 100644 --- a/system/clearpilot/provision.sh +++ b/system/clearpilot/provision.sh @@ -32,11 +32,9 @@ sudo mount -o remount,rw / echo "Installing packages..." sudo apt-get update -qq sudo apt-get install -y openvpn curl ccrypt -echo "Installing Node.js 18..." -curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - +#echo "Installing Node.js 20..." +#curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash - sudo apt-get install -y nodejs -node -v -sudo apt-get install -y npm mount -o rw,remount / echo "Installing Claude Code..." curl -fsSL https://claude.ai/install.sh | bash @@ -49,10 +47,12 @@ serial=$(sed 's/.*androidboot.serialno=\([^ ]*\).*/\1/' /proc/cmdline) ssh_dir="/data/ssh/.ssh" if [[ $serial == 3889765b ]] && [[ ! -f "$ssh_dir/id_ed25519" || ! -f "$ssh_dir/id_ed25519.pub" ]]; then echo "Decrypting SSH identity keys (serial=$serial)..." - bash /data/openpilot/system/clearpilot/tools/decrypt /data/openpilot/system/clearpilot/dev/id_ed25519.cpt /data/openpilot/system/clearpilot/dev/id_ed25519 - bash /data/openpilot/system/clearpilot/tools/decrypt /data/openpilot/system/clearpilot/dev/id_ed25519.pub.cpt /data/openpilot/system/clearpilot/dev/id_ed25519.pub + tmpdir=$(mktemp -d) + bash /data/openpilot/system/clearpilot/tools/decrypt /data/openpilot/system/clearpilot/dev/id_ed25519.cpt "$tmpdir/id_ed25519" + bash /data/openpilot/system/clearpilot/tools/decrypt /data/openpilot/system/clearpilot/dev/id_ed25519.pub.cpt "$tmpdir/id_ed25519.pub" mkdir -p "$ssh_dir" - cp /data/openpilot/system/clearpilot/dev/id_ed25519 /data/openpilot/system/clearpilot/dev/id_ed25519.pub "$ssh_dir/" + cp "$tmpdir/id_ed25519" "$tmpdir/id_ed25519.pub" "$ssh_dir/" + rm -rf "$tmpdir" chmod 700 "$ssh_dir" chmod 600 "$ssh_dir/id_ed25519" chmod 644 "$ssh_dir/id_ed25519.pub" @@ -76,15 +76,8 @@ fi # 5. Build echo "" -echo "Starting build..." -sudo su - comma -c "bash /data/openpilot/build_only.sh" -if [ $? -eq 0 ]; then - echo "Build succeeded" - touch /data/quick_boot -else - echo "Build failed" - sleep 10 -fi +sudo chown -R comma:comma /data/openpilot +touch /data/quick_boot echo "Provision complete" sleep 2