diff --git a/install/dfall_install_ros_kinetic_ubuntu16.sh b/install/dfall_install_ros_kinetic_ubuntu16.sh index b4e209dd52fb7f4d637cb67ec354bc66c006d015..620f365662d41c09d1b470a1bc0c71f936ed50a5 100755 --- a/install/dfall_install_ros_kinetic_ubuntu16.sh +++ b/install/dfall_install_ros_kinetic_ubuntu16.sh @@ -57,7 +57,9 @@ sudo rosdep init rosdep update # Add the ROS environment setup to the .bashrc -echo "source /opt/ros/kinetic/setup.bash" >> ~/.bashrc +# NOTE: this is added to the .bashrc at the end to keep all such +# additions in one place +#echo "source /opt/ros/kinetic/setup.bash" >> ~/.bashrc # Run it now so that it is valid for this terminal session source /opt/ros/kinetic/setup.bash @@ -147,12 +149,36 @@ catkin_make -j4 # --------------------------------------------------------------- # # ADD TO THE .bashrc THE D-FaLL-System CONFIG AND ROS PACKAGE SETUP +# Add a heading for the addition to the .bashrc +echo "# ADDED AS PART OF THE D-FaLL-System INSTALLATION" >> ~/.bashrc + +# Add an evironment variable that point to the D-FaLL-System Repository +echo "# Environment variable for the home directory" >> ~/.bashrc +echo "export DFALL_HOME=\"/home/agent01/work/D-FaLL-System\"" >> ~/.bashrc +# And set the environment variable for this terminal session +export DFALL_HOME="/home/agent01/work/D-FaLL-System" + +# Add the ROS environment setup to the .bashrc +echo "# Source the ROS setup" >> ~/.bashrc +echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc + # Add the D-FaLL ROS Package setup to the .bashrc +echo "# Source the D-FaLL package setup" >> ~/.bashrc +echo "# > Note that the \"devel\" folder is created as part of running \"catkin_make\"" >> ~/.bashrc echo "source ~/work/D-FaLL-System/dfall_ws/devel/setup.bash" >> ~/.bashrc # And run it now so that it is valid for this terminal session source ~/work/D-FaLL-System/dfall_ws/devel/setup.bash # Add the "Config.sh" shell script to the .bashrc +echo "# Source the D-FaLL config shell script" >> ~/.bashrc echo "source ~/work/D-FaLL-System/dfall_ws/src/dfall_pkg/launch/Config.sh" >> ~/.bashrc # And run it now so that it is valid for this terminal session -source ~/work/D-FaLL-System/dfall_ws/src/dfall_pkg/launch/Config.sh \ No newline at end of file +source ~/work/D-FaLL-System/dfall_ws/src/dfall_pkg/launch/Config.sh + +# Add an alias for changing directory to the D-FaLL-System repository +echo "# Alias for changing directory to the \$DFALL_HOME" >> ~/.bashrc +echo "alias dfall=\"cd $DFALL_HOME\"" >> ~/.bashrc +echo "alias cddfall=\"cd $DFALL_HOME\"" >> ~/.bashrc +# And run it now so that it is valid for this terminal session +alias dfall="cd $DFALL_HOME" +alias cddfall="cd $DFALL_HOME" \ No newline at end of file diff --git a/install/dfall_install_ros_melodic_ubuntu18.sh b/install/dfall_install_ros_melodic_ubuntu18.sh index ef4e2c971bc31c047aff624faf7474eef79ec490..0516e944e47fbc778d0670b98a664ffea042cd2c 100755 --- a/install/dfall_install_ros_melodic_ubuntu18.sh +++ b/install/dfall_install_ros_melodic_ubuntu18.sh @@ -57,7 +57,9 @@ sudo rosdep init rosdep update # Add the ROS environment setup to the .bashrc -echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc +# NOTE: this is added to the .bashrc at the end to keep all such +# additions in one place +#echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc # Run it now so that it is valid for this terminal session source /opt/ros/melodic/setup.bash @@ -147,12 +149,36 @@ catkin_make -j4 # --------------------------------------------------------------- # # ADD TO THE .bashrc THE D-FaLL-System CONFIG AND ROS PACKAGE SETUP +# Add a heading for the addition to the .bashrc +echo "# ADDED AS PART OF THE D-FaLL-System INSTALLATION" >> ~/.bashrc + +# Add an evironment variable that point to the D-FaLL-System Repository +echo "# Environment variable for the home directory" >> ~/.bashrc +echo "export DFALL_HOME=\"/home/agent01/work/D-FaLL-System\"" >> ~/.bashrc +# And set the environment variable for this terminal session +export DFALL_HOME="/home/agent01/work/D-FaLL-System" + +# Add the ROS environment setup to the .bashrc +echo "# Source the ROS setup" >> ~/.bashrc +echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc + # Add the D-FaLL ROS Package setup to the .bashrc +echo "# Source the D-FaLL package setup" >> ~/.bashrc +echo "# > Note that the \"devel\" folder is created as part of running \"catkin_make\"" >> ~/.bashrc echo "source ~/work/D-FaLL-System/dfall_ws/devel/setup.bash" >> ~/.bashrc # And run it now so that it is valid for this terminal session source ~/work/D-FaLL-System/dfall_ws/devel/setup.bash # Add the "Config.sh" shell script to the .bashrc +echo "# Source the D-FaLL config shell script" >> ~/.bashrc echo "source ~/work/D-FaLL-System/dfall_ws/src/dfall_pkg/launch/Config.sh" >> ~/.bashrc # And run it now so that it is valid for this terminal session -source ~/work/D-FaLL-System/dfall_ws/src/dfall_pkg/launch/Config.sh \ No newline at end of file +source ~/work/D-FaLL-System/dfall_ws/src/dfall_pkg/launch/Config.sh + +# Add an alias for changing directory to the D-FaLL-System repository +echo "# Alias for changing directory to the \$DFALL_HOME" >> ~/.bashrc +echo "alias dfall=\"cd $DFALL_HOME\"" >> ~/.bashrc +echo "alias cddfall=\"cd $DFALL_HOME\"" >> ~/.bashrc +# And run it now so that it is valid for this terminal session +alias dfall="cd $DFALL_HOME" +alias cddfall="cd $DFALL_HOME" \ No newline at end of file