updated scripts

ICE9-Robotics · Dec 1, 2023 · f66776e · f66776e
1 parent 8e1c8af
commit f66776e
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 22 deletions.
diff --git a/autostart/autostart.sh b/autostart/autostart.sh
@@ -39,7 +39,7 @@ if [[ $1 == "-h" ]]; then
 	echo "  -r, --restart			restart all processes launched by autostart"
     exit 0
 elif [[ $1 == "-l" || $1 == "--log" ]]; then
-    cat ${HOME}/Unitree_GPS_Integration/autostart/.log
+    cat ${HOME}/ice9_ugi/autostart/.log
     exit 0
 elif [[ $1 == "-ka" || $1 == "--killall" ]]; then
 	kill_all
@@ -58,14 +58,14 @@ elif [[ $1 == "-r" || $1 == "--restart" ]]; then
 fi
 
 
-log_file=${HOME}/Unitree_GPS_Integration/autostart/.log
+log_file=${HOME}/ice9_ugi/autostart/.log
 log() {
 	printf "[%-12.12s]: %s\n" "main" "$1" >> ${log_file}
 	echo $1
 }
 
 export SUDO_ASKPASS=${HOME}/Unitree/autostart/passwd.sh
-ice9_scripts=${HOME}/Unitree_GPS_Integration/autostart
+ice9_scripts=${HOME}/ice9_ugi/autostart
 
 mv ${log_file} ${log_file}.backup
 log "ICE9 autostart list started."

diff --git a/autostart/scripts/config_4g.sh b/autostart/scripts/config_4g.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 log() {
-	printf "[%-12.12s]: %s\n" "config_4g" "$1" >> ${HOME}/Unitree_GPS_Integration/autostart/.log
+	printf "[%-12.12s]: %s\n" "config_4g" "$1" >> ${HOME}/ice9_ugi/autostart/.log
 	echo $1
 }
 

diff --git a/autostart/scripts/launch/launch_auxiliary.sh b/autostart/scripts/launch/launch_auxiliary.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 log() {
-	printf "[%-12.12s]: %s\n" "lch_auxi" "$1" >> ${HOME}/Unitree_GPS_Integration/autostart/.log
+	printf "[%-12.12s]: %s\n" "lch_auxi" "$1" >> ${HOME}/ice9_ugi/autostart/.log
 	echo $1
 }
 

diff --git a/autostart/scripts/launch/launch_camera.sh b/autostart/scripts/launch/launch_camera.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 log() {
-	printf "[%-12.12s]: %s\n" "lch_camera" "$1" >> ${HOME}/Unitree_GPS_Integration/autostart/.log
+	printf "[%-12.12s]: %s\n" "lch_camera" "$1" >> ${HOME}/ice9_ugi/autostart/.log
 	echo $1
 }
 

diff --git a/autostart/scripts/launch/launch_reach.sh b/autostart/scripts/launch/launch_reach.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 log() {
-	printf "[%-12.12s]: %s\n" "lch_reach" "$1" >> ${HOME}/Unitree_GPS_Integration/autostart/.log
+	printf "[%-12.12s]: %s\n" "lch_reach" "$1" >> ${HOME}/ice9_ugi/autostart/.log
 	echo $1
 }
 

diff --git a/autostart/scripts/launch/launch_slam.sh b/autostart/scripts/launch/launch_slam.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 log() {
-	printf "[%-12.12s]: %s\n" "lch_slam" "$1" >> ${HOME}/Unitree_GPS_Integration/autostart/.log
+	printf "[%-12.12s]: %s\n" "lch_slam" "$1" >> ${HOME}/ice9_ugi/autostart/.log
 	echo $1
 }
 log "Launching slam_planner_online..."

diff --git a/autostart/scripts/launch/launch_unitree_base.sh b/autostart/scripts/launch/launch_unitree_base.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 log() {
-	printf "[%-12.12s]: %s\n" "lch_unibase" "$1" >> ${HOME}/Unitree_GPS_Integration/autostart/.log
+	printf "[%-12.12s]: %s\n" "lch_unibase" "$1" >> ${HOME}/ice9_ugi/autostart/.log
 	echo $1
 }
 

diff --git a/autostart/scripts/launch_roscore.sh b/autostart/scripts/launch_roscore.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 log() {
-	printf "[%-12.12s]: %s\n" "lch_roscore" "$1" >> ${HOME}/Unitree_GPS_Integration/autostart/.log
+	printf "[%-12.12s]: %s\n" "lch_roscore" "$1" >> ${HOME}/ice9_ugi/autostart/.log
 	echo $1
 }
 
@@ -16,7 +16,7 @@ if [ ${is_nano_15} ]; then
 	log "Husarnet ready, starting roscore..."
 	sleep 1
 
-	source ${HOME}/Unitree_GPS_Integration/autostart/scripts/ros_setup.bash
+	source ${HOME}/ice9_ugi/autostart/scripts/ros_setup.bash
 	while true; do
 		roscore
 		log "Error! roscore exited."

diff --git a/autostart/scripts/launch_unitree.sh b/autostart/scripts/launch_unitree.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 
 log() {
-	printf "[%-12.12s]: %s\n" "lch_unitree" "$1" >> ${HOME}/Unitree_GPS_Integration/autostart/.log
+	printf "[%-12.12s]: %s\n" "lch_unitree" "$1" >> ${HOME}/ice9_ugi/autostart/.log
 	echo $1
 }
 
 log "Started..."
 
 is_nano_15=`ifconfig -a|grep "eth0: " -A1|grep "inet 192.168.123.15"|awk '{print $2}'`
 is_nano_13=`ifconfig -a|grep "eth0: " -A1|grep "inet 192.168.123.13"|awk '{print $2}'`
-launch_scripts_path=${HOME}/Unitree_GPS_Integration/autostart/scripts/launch
-ros_setup=${HOME}/Unitree_GPS_Integration/autostart/scripts/ros_setup.bash
+launch_scripts_path=${HOME}/ice9_ugi/autostart/scripts/launch
+ros_setup=${HOME}/ice9_ugi/autostart/scripts/ros_setup.bash
 
 source ${ros_setup}
 while [[ ! $(rostopic list) ]]; do

diff --git a/autostart/scripts/ros_setup.bash b/autostart/scripts/ros_setup.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 log_roscore() {
-	printf "[%-12.12s]: %s\n" "ros_setup" "$1" >> ${HOME}/Unitree_GPS_Integration/autostart/.log
+	printf "[%-12.12s]: %s\n" "ros_setup" "$1" >> ${HOME}/ice9_ugi/autostart/.log
 	echo $1
 }
 
@@ -17,6 +17,6 @@ fi
 
 export ROS_IPV6=on
 export ROS_MASTER_URI=http://master:11311
-source ${HOME}/Unitree_GPS_Integration/ice9_ws/devel/setup.bash
+source ${HOME}/ice9_ugi/ice9_ws/devel/setup.bash
 
 log_roscore "Done."
diff --git a/install/files/ice9_autostart.sh.desktop b/install/files/ice9_autostart.sh.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Exec=/home/unitree/Unitree_GPS_Integration/autostart/autostart.sh
+Exec=/home/unitree/ice9_ugi/autostart/autostart.sh
 Hidden=false
 NoDisplay=false
 X-GNOME-Autostart-enabled=true

diff --git a/install/install.sh b/install/install.sh
@@ -4,7 +4,9 @@ export SUDO_ASKPASS=${HOME}/Unitree/autostart/passwd.sh
 autostart_dir=${HOME}/.config/autostart
 cp files/ice9_autostart.sh ${autostart_dir}/ice9_autostart.sh.desktop
 
-mv ${autostart_dir}/update.sh.desktop ${autostart_dir}/update.sh.desktop.bak
+if [ -f ${autostart_dir}/update.sh.desktop ]; then
+    mv ${autostart_dir}/update.sh.desktop ${autostart_dir}/update.sh.desktop.bak
+fi
 if [ -f ${autostart_dir}/slam_planner.sh.desktop ]; then
     mv ${autostart_dir}/slam_planner.sh.desktop ${autostart_dir}/slam_planner.sh.desktop.bak
 fi

diff --git a/install/uninstall.sh b/install/uninstall.sh
@@ -13,13 +13,13 @@ if [ -f ${autostart_dir}/start.sh.desktop.bak ]; then
     mv ${autostart_dir}/start.sh.desktop.bak ${autostart_dir}/start.sh.desktop
 fi
 
-# Remove ros packages
-rm -rf ../ice9_ws/build
-rm -rf ../ice9_ws/devel
-
 # Uninstall Husarnet
 sudo -A apt remove husarnet -y
 sudo -A rm -rf /var/lib/husarnet
 
+# Remove ice9_ugi folder
+cd 
+rm -rf ice9_ugi
+
 # Complete
 echo "Uninstallation complete."