melodic branch

Author: wptasinski

.vscode/c_cpp_properties.json

@@ -0,0 +1,15 @@
+{
+  "configurations": [
+    {
+      "browse": {
+        "databaseFilename": "",
+        "limitSymbolsToIncludedHeaders": true
+      },
+      "includePath": [
+        "/opt/ros/melodic/include/**",
+        "/usr/include/**"
+      ],
+      "name": "ROS"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "python.autoComplete.extraPaths": [
+        "/opt/ros/melodic/lib/python2.7/dist-packages"
+    ]
+}

install

@@ -5,7 +5,7 @@
 
 set_colors
 
-echo -e "${BLUE}This is ROS setup sript${NOCOLOR}"
+echo -e "${BLUE}This is ROS Melodic setup sript${NOCOLOR}"
 read -p "Do you wish to start the installtion? [Y/n]" -n 1 -s ans && echo
 [ "${ans}" != "n" ] || exit 0
 
@@ -14,14 +14,14 @@ sudo apt update && sudo apt upgrade -y
 [ $? -eq 0 ] || error "Failed to update apt-get, aborting..."
 echo -e "${GREEN}System update done${NOCOLOR}"
 
-echo -e "${BLUE}Installing ROS dependencies${NOCOLOR}"
+echo -e "${BLUE}Installing ROS Melodic dependencies${NOCOLOR}"
 install_rosdeps
-[ $? -eq 0 ] || error "Failed to install ROS dependencies, aborting..."
+[ $? -eq 0 ] || error "Failed to install ROS Melodic dependencies, aborting..."
 echo -e "${GREEN}ROS dependencies installation done${NOCOLOR}"
 
-echo -e "${BLUE}Installing ROS${NOCOLOR}"
+echo -e "${BLUE}Installing ROS Melodic${NOCOLOR}"
 install_ros
-[ $? -eq 0 ] || error "Failed to install ROS, aborting..."
+[ $? -eq 0 ] || error "Failed to install ROS Melodic, aborting..."
 echo -e "${GREEN}ROS installation done${NOCOLOR}"
 
 echo -e "${BLUE}Installing pip modules${NOCOLOR}"
@@ -30,9 +30,9 @@ python3 -m pip install -r requirements.txt
 [ $? -eq 0 ] || echo "${RED}Failed install pip modules, continuing...${NOCLOR}"
 echo -e "${GREEN}Pip modules installaion done${NOCOLOR}"
 
-read -p "Do you wish to install simulator (Gazebo) [Y/n]" -n 1 -s ans && echo
-[ "${ans}" != "n" ] && install_gazebo
-echo -e "${GREEN}Gazebo installation done${NOCOLOR}"
+# read -p "Do you wish to install simulator (Gazebo) [Y/n]" -n 1 -s ans && echo
+# [ "${ans}" != "n" ] && install_gazebo
+# echo -e "${GREEN}Gazebo installation done${NOCOLOR}"
 
 read -p "Do you wish to install desktop environment (xfce4) [Y/n]" -n 1 -s ans \
 && echo

pkglist-gazebo

@@ -1 +1 @@
-ros-dashing-gazebo-ros-pkgs
+

pkglist-ros

@@ -1,4 +1,3 @@
-ros-dashing-ros-base
-ros-dashing-desktop
-ros-dashing-geometry*
-ros-dashing-rqt*
+ros-melodic-desktop-full
+ros-melodic-ros-control 
+ros-melodic-ros-controllers

pkglist-rosdeps

@@ -1,6 +1,7 @@
-curl
 git
-gnupg2
-lsb-release
-python3-argcomplete
-python3-pip
+python-rosdep 
+python-rosinstall 
+python-rosinstall-generator 
+python-wstool 
+build-essential
+catkin_tools

scripts/ros_setup.sh

@@ -6,14 +6,19 @@ function install_rosdeps
 
 function install_ros
 {
-	ROS_KEY_URL=https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc
+	sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
 
-	curl -s $ROS_KEY_URL | sudo apt-key add -
-	sudo sh -c 'echo "deb http://packages.ros.org/ros2/ubuntu \
-		`lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list'
+	sudo apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654z
+	curl -sSL 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xC1CF6E31E6BADE8868B172B4F42ED6FBAB17C654' | sudo apt-key add -
 
 	sudo apt update
 	sudo apt -y install --no-install-recommends `cat pkglist-ros`
+
+	echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc
+	source ~/.bashrc
+
+	sudo rosdep init
+	rosdep update
 }
 
 function install_gazebo

scripts/user_setup.sh

@@ -1,6 +1,6 @@
 function setup_user
 {
-	SOURCE_ROS="source /opt/ros/dashing/setup.bash"
+	SOURCE_ROS="source /opt/ros/melodic/setup.bash"
 	grep "${SOURCE_ROS}" ${HOME}/.bashrc 2> /dev/null || \
 			echo "${SOURCE_ROS}" >> ${HOME}/.bashrc	
 }