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.

Sign up for GitHub

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

Manually merge Aidan Delaneys pull request #144

Merged
merged 6 commits into from
May 18, 2015
Merged

Manually merge Aidan Delaneys pull request #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98cf1bf
Updated version of gubbins package in install-userspace.sh
AidanDelaney Apr 20, 2015
17c4924
This time with valid URL for updated gubbins package.
AidanDelaney Apr 20, 2015
a121363
Updated documentation to fix Issue #130
AidanDelaney Apr 20, 2015
c055bdf
Merge branch 'AidanDelaney-master'
andrewjpage May 18, 2015
c9276d1
install md
andrewjpage May 18, 2015
cf0d8a7
Merge branch 'master' of github.com:sanger-pathogens/gubbins
andrewjpage May 18, 2015
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
1 change: 1 addition & 0 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ If you do not have permission to install the software as root and instead want t
$ wget https://bootstrap.pypa.io/ez_setup.py -O - | python - --user
$ ~/.local/bin/easy_install -U --user biopython
$ ~/.local/bin/easy_install -U --user dendropy
$ autoreconf -i
$ ./configure --prefix=~/.local
$ make
$ make install
Expand Down
2 changes: 1 addition & 1 deletion install-userspace.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#

py_pkgs=( "biopython" "dendropy" )
deb_urls=( "http://uk.archive.ubuntu.com/ubuntu/pool/universe/r/raxml/raxml_7.2.8-2_amd64.deb" "https://launchpad.net/~ap13/+archive/ubuntu/gubbins/+files/fastml2_2.3~trusty1_amd64.deb" "https://launchpad.net/~ap13/+archive/ubuntu/gubbins/+files/gubbins_1.1.1~trusty1_amd64.deb" )
deb_urls=( "http://uk.archive.ubuntu.com/ubuntu/pool/universe/r/raxml/raxml_7.2.8-2_amd64.deb" "https://launchpad.net/~ap13/+archive/ubuntu/gubbins/+files/fastml2_2.3~trusty1_amd64.deb" "https://launchpad.net/~ap13/+archive/ubuntu/gubbins/+files/gubbins_1.3.3~trusty1_amd64.deb" )

function check_platform {
# Ubuntu 14.04
Expand Down