Skip to content

Commit

Permalink
Fix RuntimeManager on lxterminal #1203
Browse files Browse the repository at this point in the history
  • Loading branch information
andoh104 committed Apr 27, 2019
1 parent 92e4c8b commit e2c75c0
Showing 1 changed file with 15 additions and 14 deletions.
29 changes: 15 additions & 14 deletions ros/run
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,10 @@ MY_PATH=$(readlink -f $(dirname $0))
OPTION_WORKING_DIR='--working-directory'
OPTION_CORE_GEOMETRY='--geometry=50x10+0+0'
OPTION_RM_GEOMETRY='--geometry=50x10+500+0'
OPTION_TITLE='--title'
OPTION_COMMAND='--command'


MASTER_DISPLAY_OPTION="${OPTION_CORE_GEOMETRY} ${OPTION_TITLE}\=\"roscore\""
RUNMGR_DISPLAY_OPTION="${OPTION_RM_GEOMETRY} ${OPTION_TITLE}\=\"runtime_manager\""

if [ $(which gnome-terminal) ]; then
TERMINAL=gnome-terminal
GNOME_VERSION=$(gnome-terminal --version | cut -d '.' -f 2)
if [ ${GNOME_VERSION} -ge 14 ]; then
MASTER_DISPLAY_OPTION=''
RUNMGR_DISPLAY_OPTION=''
fi
elif [ $(which mate-terminal) ]; then
if [ $(which mate-terminal) ]; then
TERMINAL=mate-terminal
elif [ $(which xfce4-terminal) ]; then
TERMINAL=xfce4-terminal
Expand All @@ -35,10 +25,21 @@ elif [ $(which konsole) ]; then
OPTION_TITLE='-T'
fi

MASTER_DISPLAY_OPTION="${OPTION_CORE_GEOMETRY} ${OPTION_TITLE}=\"roscore\""
RUNMGR_DISPLAY_OPTION="${OPTION_RM_GEOMETRY} ${OPTION_TITLE}=\"runtime_manager\""

if [ $(which gnome-terminal) ]; then
TERMINAL=gnome-terminal
GNOME_VERSION=$(gnome-terminal --version | cut -d '.' -f 2)
if [ ${GNOME_VERSION} -ge 14 ]; then
MASTER_DISPLAY_OPTION=''
RUNMGR_DISPLAY_OPTION=''
fi
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

0 comments on commit e2c75c0

Please sign in to comment.