Skip to content

Commit

Permalink
Changed Autoware/ros/run from being dependent on gksu to using sudo (#…
Browse files Browse the repository at this point in the history
…1918)

* Changed Autoware/ros/run from being dependent on gksu to using sudo
addressing https://github.com/CPFL/Autoware/issues/1917
  • Loading branch information
LukeAI authored and sgermanserrano committed Feb 1, 2019
1 parent 92425d7 commit 8e0485f
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion docker/96boards/Dockerfile.kinetic
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main"
RUN apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
RUN apt-get update && apt-get install -y ros-kinetic-desktop-full ros-kinetic-nmea-msgs ros-kinetic-nmea-navsat-driver ros-kinetic-sound-play ros-kinetic-jsk-visualization ros-kinetic-grid-map ros-kinetic-gps-common
RUN apt-get update && apt-get install -y ros-kinetic-controller-manager ros-kinetic-ros-control ros-kinetic-ros-controllers ros-kinetic-gazebo-ros-control ros-kinetic-joystick-drivers
RUN apt-get update && apt-get install -y libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev python-wxgtk3.0 software-properties-common libmosquitto-dev libyaml-cpp-dev python-flask python-requests
RUN apt-get update && apt-get install -y libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev libgl1-mesa-dev libglew-dev python-wxgtk3.0 software-properties-common libmosquitto-dev libyaml-cpp-dev python-flask python-requests

# Add basic user
ENV USERNAME autoware
Expand Down
4 changes: 2 additions & 2 deletions docker/generic/Dockerfile.kinetic
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main"
RUN apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116
RUN apt-get update && apt-get install -y ros-kinetic-desktop-full ros-kinetic-nmea-msgs ros-kinetic-nmea-navsat-driver ros-kinetic-sound-play ros-kinetic-jsk-visualization ros-kinetic-grid-map ros-kinetic-gps-common
RUN apt-get update && apt-get install -y ros-kinetic-controller-manager ros-kinetic-ros-control ros-kinetic-ros-controllers ros-kinetic-gazebo-ros-control ros-kinetic-joystick-drivers
RUN apt-get update && apt-get install -y libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev python-wxgtk3.0 software-properties-common libmosquitto-dev libyaml-cpp-dev python-flask python-requests
RUN apt-get update && apt-get install -y libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev libgl1-mesa-dev libglew-dev python-wxgtk3.0 software-properties-common libmosquitto-dev libyaml-cpp-dev python-flask python-requests

# Add basic user
ENV USERNAME autoware
Expand Down Expand Up @@ -78,4 +78,4 @@ RUN gconftool-2 --set "/apps/gnome-terminal/profiles/Default/use_theme_colors" -
RUN gconftool-2 --set "/apps/gnome-terminal/profiles/Default/background_color" --type string "#000000"

# Default CMD
CMD ["/bin/bash"]
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion docs/en/installation_with_db820c.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ $ sudo fastboot flash rootfs stretch.raw
Install the below packages on Dragonboard820c:

```shell
$ sudo apt-get install -y libxmu-dev libxi-dev libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev python-wxgtk3.0 software-properties-common libmosquitto-dev libyaml-cpp-dev python-flask python-requests dirmngr libtf2-eigen-dev libpcl-dev python3-pip python3-setuptools
$ sudo apt-get install -y libxmu-dev libxi-dev libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev libgl1-mesa-dev libglew-dev python-wxgtk3.0 software-properties-common libmosquitto-dev libyaml-cpp-dev python-flask python-requests dirmngr libtf2-eigen-dev libpcl-dev python3-pip python3-setuptools
$ sudo pip3 install -U setuptools
```

Expand Down
4 changes: 2 additions & 2 deletions docs/en/installation_with_drivepx2.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
sudo apt-get install -y ros-kinetic-desktop-full
sudo apt-get install -y ros-kinetic-nmea-msgs ros-kinetic-nmea-navsat-driver ros-kinetic-sound-play ros-kinetic-jsk-visualization ros-kinetic-grid-map ros-kinetic-gps-common
sudo apt-get install -y ros-kinetic-controller-manager ros-kinetic-ros-control ros-kinetic-ros-controllers ros-kinetic-gazebo-ros-control ros-kinetic-joystick-drivers
sudo apt-get install -y libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev gksu libgl1-mesa-dev libglew-dev
sudo apt-get install -y libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev libgl1-mesa-dev libglew-dev
sudo apt-get install -y ros-kinetic-camera-info-manager-py ros-kinetic-camera-info-manager

### SSD Installation
Expand All @@ -60,7 +60,7 @@ If you need to use a SSD detector, please refer SSD readme.
source /opt/ros/kinetic/setup.bash

sudo apt-get install -y openssh-server libnlopt-dev freeglut3-dev qtbase5-dev libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev git
sudo apt-get install -y libnlopt-dev freeglut3-dev qt5-default libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev libglew-dev gksu
sudo apt-get install -y libnlopt-dev freeglut3-dev qt5-default libqt5opengl5-dev libssh2-1-dev libarmadillo-dev libpcap-dev libglew-dev
sudo apt-get install -y libxmu-dev python-wxgtk3.0 python-wxgtk3.0-dev
sudo ln -s /usr/include/aarch64-linux-gnu/qt5 /usr/include/qt5

Expand Down
4 changes: 2 additions & 2 deletions ros/cleanup
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ if [[ $PROC_MANAGERS == "" ]]; then
fi

if [[ $UID != 0 ]]; then
gksudo --message "Please input for password for cleanup" \
-- kill $PROC_MANAGERS
echo "Please input password for cleanup"
sudo kill $PROC_MANAGERS
else
kill $PROC_MANAGERS
fi
5 changes: 1 addition & 4 deletions ros/run
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ elif [ $(which konsole) ]; then
OPTION_TITLE='-T'
fi

echo "Process Manager"

gksudo --message "Please input password for launching process manager" \
-- $MY_PATH/run_proc_manager &
sudo bash -c "$MY_PATH/run_proc_manager &"

ADDR=$($MY_PATH/src/.config/rviz/subnet_chk.py -)
if [ "$?" == "0" ]; then
Expand Down
5 changes: 4 additions & 1 deletion ros/src/util/packages/runtime_manager/scripts/add_perm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ S="0$(stat -c %a $F)" # ex. "0666"

if [ $(($S & $P)) -ne $(($P)) ]; then
M=$(echo "obase=8; $(($S | $P))" | bc)
gksudo --message "Please input password for chmod $F" -- chmod "0$M" $F || exit 1
echo "Please input password for chmod $F"
sudo chmod "0$M" $F || exit 1


fi

exit 0
Expand Down

0 comments on commit 8e0485f

Please sign in to comment.