Merge branch 'master' of https://github.com/grotius-cnc/linuxcnc

cmake/build_cmake

@@ -1,11 +1,9 @@
 #!/bin/sh
+
 echo "current folder:"
 echo $PWD
 echo "\n"
 
-echo "check dependencies. \n"
-sudo apt-get install libeigen3-dev
-
 echo "removing rtapi_app & linuxcnc_module_helper to overwrite. \n"
 cd ../bin
 rm -f rtapi_app
@@ -26,18 +24,20 @@ echo "current folder:"
 echo $PWD
 echo "\n"
 
-	# Recreate the Sudo Make Setuid command (needed for running real machines)
-	# This version is from : https://github.com/grotius-cnc/hal-core/blob/main/make
+# Recreate the Sudo Make Setuid command (needed for running real machines)
+# This version is from : https://github.com/grotius-cnc/hal-core/blob/main/make
 echo "Running equivalent of Sudo Make Setuid. \n"
 sudo chown 777 -R bin/rtapi_app
 sudo chown 777 -R bin/linuxcnc_module_helper
 sudo chmod 777 bin/rtapi_app
 sudo chmod 777 bin/linuxcnc_module_helper
 
-echo "Start linuxcnc. \n"
-cd scripts
-./rip-environment linuxcnc ../configs/sim/axis/axis_mm.ini
+if [ $# -eq 0 ]
+then
+    echo "Start linuxcnc. \n"
+    cd scripts
+    ./rip-environment linuxcnc ../configs/sim/axis/axis_mm.ini 2>&1 | tee ../cmake/run.log
 
 	# Example to start with custom trajectory planner or use in ini file : [TRAJ]TPMOD=user_tpcomp
 	# ./rip-environment linuxcnc -t tpmod_scurve ../configs/sim/axis/axis_mm.ini
-	
+fi

cmake/install_build_deps

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 echo "Installing dependencies. \n"
-
+sudo apt-get install libeigen3-dev
 sudo apt-get install git cmake automake
 sudo apt-get install libudev-dev libmodbus-dev libusb-1.0-0-dev libgpiod-dev libgtk-3-dev libgtk2.0-dev
 sudo apt-get install libglib2.0-dev yapps2 intltool libboost-dev python3-dev bwidget