From b05da55c86864200df005658d3d4967e7b9e97c1 Mon Sep 17 00:00:00 2001
From: Neal Probert <nprobert@probestar.net>
Date: Mon, 29 Jul 2024 13:12:58 -0400
Subject: [PATCH] CarPC setup updated

---
 CarPC/carpc-setup.sh                      | 15 ++++++++-------
 CarPC/etc/rc.local                        |  9 ---------
 CarPC/lib/systemd/system/rc-local.service | 21 ---------------------
 3 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 CarPC/lib/systemd/system/rc-local.service

diff --git a/CarPC/carpc-setup.sh b/CarPC/carpc-setup.sh
index f612e64..72910a2 100755
--- a/CarPC/carpc-setup.sh
+++ b/CarPC/carpc-setup.sh
@@ -32,7 +32,7 @@ sudo apt-get update
 # clone/pull
 mkdir -p $HOME/ProbeStar
 cd $HOME/ProbeStar
-for i in git_tools linux_tools Cnomicon Pynomicon
+for i in git_tools linux_tools Cnomicon CyVehicle Pynomicon
 do
   if [ -d $i ]; then
     cd $i
@@ -40,7 +40,7 @@ do
     git pull --recurse-submodules
     cd ..
   else
-    git clone https://github.com/nprobert/$i --recurse-submodules
+    git clone https://www.probestar.com/PStar/$i --recurse-submodules
   fi
 done
 cd $HOME
@@ -49,6 +49,7 @@ for i in ProbeStar/*; do
 done
 mkdir bin
 cp linux_tools/bin/* bin/
+cp git_tool/bin/* bin/
 
 # checkouts
 mkdir -p $HOME/NTCNA
@@ -61,7 +62,7 @@ do
     git pull --recurse-submodules
     cd ..
   else
-    git clone https://github.com/nprobert/$i --recurse-submodules
+    git clone https://www.probestar.com/NTCNA-TP/$i --recurse-submodules
   fi
 done
 cd $HOME
@@ -74,16 +75,16 @@ if [ -d $HOME/ProbeStar/Cnomicon ]; then
   cd $HOME/Cnomicon/packages
   ./packages.sh
   cd ..
-  ./cbuild.sh
-  ./cinstall.sh
+#  ./cbuild.sh
+#  ./cinstall.sh
 fi
 
 if [ -d $HOME/NTCNA/CVehicle ]; then
   cd $HOME/CVehicle/packages
   ./packages.sh
   cd ..
-  ./cbuild.sh
-  ./cinstall.sh
+#  ./cbuild.sh
+#  ./cinstall.sh
 fi
 
 # python stuff
diff --git a/CarPC/etc/rc.local b/CarPC/etc/rc.local
index 91a1a00..b3f92b3 100644
--- a/CarPC/etc/rc.local
+++ b/CarPC/etc/rc.local
@@ -21,13 +21,4 @@ ifconfig can0 up
 /usr/local/cnomicon/sbin/cnomicon-setup
 /usr/local/cvehicle/sbin/cvehicle-setup
 
-# BSMP standalone (without MABX2)
-ping -c 1 -W 1 mabx2 &> /dev/null
-if [ "$?" = "1" ]
-then
-  echo "MABX2 not found!"
-  #cd /home/neal/NTCNA/CVehicle/daemons/bsmpd
-  #./gen5bsmpd.sh
-fi
-
 exit 0
diff --git a/CarPC/lib/systemd/system/rc-local.service b/CarPC/lib/systemd/system/rc-local.service
deleted file mode 100644
index 4cd18d0..0000000
--- a/CarPC/lib/systemd/system/rc-local.service
+++ /dev/null
@@ -1,21 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=/etc/rc.local Compatibility
-ConditionPathExists=/etc/rc.local
-
-[Service]
-Type=forking
-ExecStart=/etc/rc.local start
-TimeoutSec=0
-StandardOutput=tty
-RemainAfterExit=yes
-SysVStartPriority=99
-
-[Install]
-WantedBy=multi-user.target