Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
pschillinger committed Dec 18, 2018
2 parents c59d4d4 + 16ea281 commit bf84187
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion bin/nwjs_install
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fi

# ready to go
echo "Downloading nwjs..."
wget -q -O $TEMPFILE https://dl.nwjs.io/$VERSION/nwjs-$VERSION-$OS-$ARCH.tar.gz
curl -s -o $TEMPFILE https://dl.nwjs.io/$VERSION/nwjs-$VERSION-$OS-$ARCH.tar.gz

echo "Unpacking..."
tar -xzf $TEMPFILE --strip-components 1
Expand Down
2 changes: 2 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

<buildtool_depend>catkin</buildtool_depend>

<build_depend>curl</build_depend>

<run_depend>rospy</run_depend>
<run_depend>genpy</run_depend>
<run_depend>actionlib</run_depend>
Expand Down

0 comments on commit bf84187

Please sign in to comment.