From cb6527a05ecbb2a9fd171a18b4bd334ca1ae9c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Germain?= <mickael.germain@pixmap3d.com>
Date: Mon, 19 Sep 2016 09:51:38 +0200
Subject: [PATCH] Change init behavior

Build the cache file instead of using de default file
---
 plugins/ros/ros.cache.default | 5 -----
 plugins/ros/ros.plugin.zsh    | 8 +++-----
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 plugins/ros/ros.cache.default

diff --git a/plugins/ros/ros.cache.default b/plugins/ros/ros.cache.default
deleted file mode 100644
index a4e35be06..000000000
--- a/plugins/ros/ros.cache.default
+++ /dev/null
@@ -1,5 +0,0 @@
-master_ip_default = localhost
-master_ip = localhost
-ros_distro_default = 
-ros_interface = 
-ros_workspace = 
diff --git a/plugins/ros/ros.plugin.zsh b/plugins/ros/ros.plugin.zsh
index 3521abcf7..e9c98bcb9 100644
--- a/plugins/ros/ros.plugin.zsh
+++ b/plugins/ros/ros.plugin.zsh
@@ -269,11 +269,9 @@ rosworkspace() {
 _omz_ros_config_init() {
   [ ! -d "$ZSH_CACHE_DIR" ] && mkdir -p "$ZSH_CACHE_DIR"
   if [ ! -f "$ZSH_CACHE_DIR/ros.cache" ]; then
-    cp "$_OMZ_ROS_DIR/ros.cache.default" "$ZSH_CACHE_DIR/ros.cache" || \
-    return "$?"
-    [ ! "$(_omz_ros_config_get_line 'ros_distro_default')" ] && \
-    _omz_ros_config_set_line 'ros_distro_default' \
-    $(_omz_ros_distro_get_list | tail -n 1) || return "$?"
+    touch "$ZSH_CACHE_DIR/ros.cache" && \
+    rosdistro default "$(_omz_ros_distro_get_list | tail -n 1)" && \
+    rosmaster default 'localhost' || return "$?"
   fi
 
   return 0