Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding in console to use dev shell #437

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions scripts/bootstrap
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash

./scripts/init_workspace

[ -e ../appctl/appctl ] && ./scripts/init_workspace -x ${PWD}/../appctl/appctl
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a comment here?

constantegonzalez marked this conversation as resolved.
Show resolved Hide resolved
24 changes: 24 additions & 0 deletions scripts/console
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/usr/bin/env bash
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should use a set -e ?


cd "$(dirname "$0")/.."

./scripts/bootstrap

[[ "$(docker images | grep -c lg_ros_nodes.*latest)" == 0 ]] && ./scripts/update

MOUNTS=""

for rosnode in $(ls catkin/src/* -d | grep -v CMake); do
# $rosnode is catkin/src/package_name
MOUNTS="${MOUNTS} -v $(readlink ${rosnode}):/src/lg_ros_nodes/${rosnode}"
done

echo ${MOUNTS}

docker run ${MOUNTS} -it lg_ros_nodes:latest /bin/bash -c "
cd /src/lg_ros_nodes/catkin
source devel/setup.bash
source ../scripts/docker_xvfb_add.sh
echo 'run catkin_make before anything'
/bin/bash
"
10 changes: 5 additions & 5 deletions scripts/init_workspace
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import os
import argparse
from subprocess import Popen
from ConfigParser import RawConfigParser, NoSectionError, NoOptionError
from configparser import RawConfigParser, NoSectionError, NoOptionError

# make sure to set the root directory
ROOT_DIR = os.path.realpath(os.curdir)
Expand Down Expand Up @@ -37,7 +37,7 @@ def parse_config():
"""
config_file = 'scripts/init.cfg'
if not os.path.exists(config_file):
print 'WARNING, no %s found, using possibly outdated configuration' % config_file
print('WARNING, no %s found, using possibly outdated configuration' % config_file)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Single or double quotes?

return # rely on hard coded values... maybe an exception would work
# setting these globals
global IGNORE_DIRS
Expand Down Expand Up @@ -186,9 +186,9 @@ def check_validity():
for needed in NEEDED_DIRS:
if needed not in links:
passed = False
print "############## WARNING catkin/src SHOULD HAVE %s LINK ##############" % needed
print("############## WARNING catkin/src SHOULD HAVE %s LINK ##############" % needed)
if passed:
print "Successfully completed workspace initialization"
print("Successfully completed workspace initialization")


def main():
Expand Down
4 changes: 4 additions & 0 deletions scripts/update
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env bash

cd "$(dirname "$0")/.."
docker build . -t lg_ros_nodes