From fb69147d3c2ada81ec91988a4353ccef55250472 Mon Sep 17 00:00:00 2001
From: david boelke <david.boelke@rwth-aachen.de>
Date: Fri, 22 Jul 2022 20:08:05 +0200
Subject: [PATCH] rest

---
 Dockerfile                   |   6 +++---
 scripts/.prepare.sh.swp      | Bin 0 -> 12288 bytes
 scripts/prepare.sh           |  14 ++++++++++++++
 entry.sh => scripts/start.sh |   3 +--
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 scripts/.prepare.sh.swp
 create mode 100644 scripts/prepare.sh
 rename entry.sh => scripts/start.sh (67%)

diff --git a/Dockerfile b/Dockerfile
index 8084794..99c041d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN adduser user --home /home/user
 RUN echo 'root:DOCKER'|chpasswd
 RUN echo 'user:docker'|chpasswd
 RUN echo "user ALL=(ALL:ALL) ALL" >> /etc/sudoers
-RUN echo "source /opt/ros/melodic/setup.bash" >> /home/user/.bashrc
+#RUN echo "source /opt/ros/melodic/setup.bash" >> /home/user/.bashrc
 # covenience, this entire block can be removed without affecting the functionality
 USER user
 WORKDIR /home/user
@@ -25,9 +25,9 @@ WORKDIR /home/user/catkin_ws/src
 RUN git clone https://github.com/tecnalia-medical-robotics/manipulability_metrics
 
 # entry script
-COPY entry.sh /home/user/catkin_ws/entry.sh
+COPY scripts/* /home/user/catkin_ws/scripts/
 WORKDIR /home/user/catkin_ws
 USER root
-RUN chmod u+x /home/user/catkin_ws/entry.sh && chown user: /home/user/catkin_ws/entry.sh
+#RUN chmod u+x /home/user/catkin_ws/scripts/* && chown user: /home/user/catkin_ws/scripts/*
 USER user
 
diff --git a/scripts/.prepare.sh.swp b/scripts/.prepare.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..21585ff70b23a890a7f141921c542532723f17b5
GIT binary patch
literal 12288
zcmYc?2=nw+u+TGPU|?VnU|`U=bSue1Cxqcu8Z$#mVp(PiNSpvpNlnfspad*k2R2Z@
zK)<NGBtzfVF*w9E$T7&t)iXrDBsDohKRvTVKO;4#AigNSSid;AD6^oXSihhswIH!5
zRj)V$Y{n=t8UmvsKyC=|G8h{f8h~^wD=8`n3x$H1qj)p~MnhmU1V%$(Gz3ONU^E0q
zLtr!nMnhnPgg{9FBSSp{0|OJ(zkE=d5sij&N2$>e7!85Z5Eu=C(GVC7fzc2c4S~@R
z7!85Z5Eu=C(GVC7fgu<Ii75;WIeZKZ2S6Qv0R{#T1@guneg=jNeg=j}eg=jxeg=kM
zeg+1Aeg+0Veg+0}eg+0jeg=kbd<+a<`4||U@G&slfSR!%W&p^LQ9K#~qaiRF0;3@?
z8UmvsFd71*Aut*OqaiRF0;3@?8Uj=bf#UqqqU2PCl+?1+9R1?dlF|abq{QM3hUCPO
z?99CQ+{Elu24w{hrI47Hq5xLGz)+N5oRV6gkeOFpl9-dDpsSl!l%K0xkXVvYtWaE(
zte~r#nVy$ll&TBn6e;Ld!nBkYq$HMrjD+b;Ni9gtOG(X3&P*+4U~u(!W8f@g;4Ek0
z%*!vzP0Uen&kheyab+mW%vI2JRnX7K&rQ`YElw@chq|!5SiiU^SwA;1FSDRDCow5A
zC$pq7J~y?bC^NYjhj4sqMPhD2PHM4!X;Dg=enDbhN}?W!saKJhT$Hb1W1|3ah_XUa
lYHog6szP33ZfbEsVsffNNxnj2S$<}ULP1e}Qch|v0|4T&ps@e|

literal 0
HcmV?d00001

diff --git a/scripts/prepare.sh b/scripts/prepare.sh
new file mode 100644
index 0000000..4edcd96
--- /dev/null
+++ b/scripts/prepare.sh
@@ -0,0 +1,14 @@
+# remove namespace to avoid problem
+vim -E /home/user/catkin_ws/src/manipulability_metrics/manipulability_metrics_examples/urdf/panda.urdf.xacro << EOF
+	normal GkWWdE
+	w
+	q
+EOF
+
+# install dependencies
+rosdep update
+rosdep install --from-paths src --ignore-src -r -y
+
+# make and setup
+catkin_make
+source devel/setup.bash
diff --git a/entry.sh b/scripts/start.sh
similarity index 67%
rename from entry.sh
rename to scripts/start.sh
index 1995bf9..a224ea4 100644
--- a/entry.sh
+++ b/scripts/start.sh
@@ -1,3 +1,2 @@
-source devel/setup.bash
-catkin_make
+# run launch file from example
 roslaunch manipulability_metrics_examples panda_manipulability_demo.launch
-- 
GitLab