Skip to content

Commit

Permalink
Merge pull request prl-mushr#38 from prl-mushr/install_script_fix
Browse files Browse the repository at this point in the history
Install script fix
  • Loading branch information
palanc authored Jun 21, 2021
2 parents b339103 + e0b1dfe commit 275af60
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
11 changes: 6 additions & 5 deletions mushr_utils/install_scripts/mushr_install_hw_drivers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
# Need to reboot after running this script

# Install librealsense. Following commands copied from
# https://github.com/JetsonHacksNano/installLibrealsense/blob/master/installLibrealsense.sh
sudo apt-key adv --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key
sudo add-apt-repository "deb http://realsense-hw-public.s3.amazonaws.com/Debian/apt-repo bionic main" -u
# https://github.com/IntelRealSense/librealsense/blob/master/doc/distribution_linux.md
sudo apt-key adv --keyserver keys.gnupg.net --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE
sudo add-apt-repository "deb https://librealsense.intel.com/Debian/apt-repo $(lsb_release -cs) main" -u
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F42ED6FBAB17C654
sudo apt-get install apt-utils -y
sudo apt-get install librealsense2-utils librealsense2-dev -y

Expand All @@ -18,7 +19,7 @@ sudo startup/initenv.sh
# Install BLDC tool. Following commands adapted from:
# https://github.com/jetsonhacks/installBLDC/blob/master/installBLDC.sh
cd $ROOT
sudo apt-get install qtcreator libqt4-dev libudev-dev libqt5serialport5-dev
sudo apt-get install qtcreator libqt4-dev libudev-dev libqt5serialport5-dev -y
git clone https://github.com/vedderb/bldc-tool
cd bldc-tool
qmake -qt=qt5
Expand Down Expand Up @@ -64,6 +65,6 @@ cd ~/catkin_ws
catkin_make

# Install timed roslaunch
sudo apt install ros-melodic-timed-roslaunch
sudo apt install ros-melodic-timed-roslaunch -y

echo "Hardware drivers installed, please reboot for changes to take effect"
4 changes: 2 additions & 2 deletions mushr_utils/install_scripts/mushr_install_ros.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31
sudo apt update

# Install ROS libraries
sudo apt install ros-melodic-desktop
sudo apt install ros-melodic-desktop -y

# Auto source ROS on terminal startup
echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc
Expand All @@ -19,7 +19,7 @@ echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc
source /opt/ros/melodic/setup.bash

# Install rosdep
sudo apt install python-rosdep
sudo apt install python-rosdep -y

# Initialize rosdep
sudo rosdep init
Expand Down
8 changes: 4 additions & 4 deletions mushr_utils/install_scripts/mushr_install_stack.sh
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#!/bin/bash

# Install git
sudo apt install git-all
sudo apt install git-all -y

# Install tkinter
sudo apt install python-tk
sudo apt install python-tk -y

# Install vcstool
sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
sudo apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-key 0xAB17C654
sudo apt-get update
sudo apt-get install python3-vcstool
sudo apt-get install python3-vcstool -y

# Install pip
sudo apt install python-pip

# Install extra ROS packages
sudo apt install -y ros-melodic-ackermann-msgs ros-melodic-map-server ros-melodic-serial ros-melodic-urg-node ros-melodic-robot-state-publisher ros-melodic-xacro ros-melodic-joy
sudo apt install -y ros-melodic-ackermann-msgs ros-melodic-map-server ros-melodic-serial ros-melodic-urg-node ros-melodic-robot-state-publisher ros-melodic-xacro ros-melodic-joy -y

# Create workspace
cd ~
Expand Down
2 changes: 1 addition & 1 deletion repos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repositories:
mushr/mushr_hardware/realsense:
type: git
url: https://github.com/IntelRealSense/realsense-ros.git
version: 31fa75ec835650d319f2d5abd3f7d0ab66fd37f4
version: development
range_libc:
type: git
url: https://github.com/prl-mushr/range_libc
Expand Down

0 comments on commit 275af60

Please sign in to comment.