Skip to content

Commit 0fe936d

Browse files
committed
[slime_ros] changed the way .sbclrc is handled:
there is no need to backup .sbclrc, it is not being overwritten but is augmented with needed stuff when it is missing.
1 parent 4430ce7 commit 0fe936d

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
*~
22
*#
33
rosemacs/rosemacs-config.el
4-
slime_ros/sbclrc
4+
slime_ros/sbclrc-ros
55
slime_ros/slime-config.el

slime_ros/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ catkin_package()
1010
###############
1111

1212
configure_file(
13-
${PROJECT_SOURCE_DIR}/sbclrc.in
14-
${PROJECT_SOURCE_DIR}/sbclrc)
13+
${PROJECT_SOURCE_DIR}/sbclrc-ros.in
14+
${PROJECT_SOURCE_DIR}/sbclrc-ros)
1515
configure_file(
1616
${PROJECT_SOURCE_DIR}/slime-config.el.in
1717
${PROJECT_SOURCE_DIR}/slime-config.el)
@@ -20,7 +20,7 @@ configure_file(
2020
## Install ##
2121
#############
2222

23-
install(FILES slime-config.el sbclrc
23+
install(FILES slime-config.el sbclrc-ros
2424
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
2525

2626
install(FILES slime-ros.el

slime_ros/sbclrc.in renamed to slime_ros/sbclrc-ros.in

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
;;; AUTOGENERATED FILE, PLEASE DO NOT EDIT: USE ~/.sbclrc INSTEAD
12

23
;;; asdf source registry entries
34
(require 'asdf)

slime_ros/slime_ros_init

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,11 @@
22

33
SLIME_ROS_DIR=$(rospack find slime_ros)
44

5-
[ -f ${HOME}/.sbclrc ] ||
6-
cp ${SLIME_ROS_DIR}/sbclrc ${HOME}/.sbclrc
5+
[ -f ${HOME}/.sbclrc ] && grep -Fq "###sbclrc-ros###" ${HOME}/.sbclrc ||
6+
echo "
7+
;;; AUTOGENERATED PART. PLEASE DO NOT DELETE THIS AND THE FOLLOWING 2 LINES
8+
;;; ###sbclrc-ros### SLIME ROS RELATED STUFF
9+
(load (merge-pathnames (make-pathname :name \".sbclrc-ros\") (user-homedir-pathname)))
10+
" >> ${HOME}/.sbclrc
11+
12+
cp ${SLIME_ROS_DIR}/sbclrc-ros ${HOME}/.sbclrc-ros

0 commit comments

Comments
 (0)