Skip to content

Commit b837779

Browse files
committed
updating startup script to match builder
1 parent 192d2c9 commit b837779

File tree

2 files changed

+23
-27
lines changed

2 files changed

+23
-27
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
name="singularity",
88

99
# Version number:
10-
version="0.58",
10+
version="0.59",
1111

1212
# Application author details:
1313
author="Vanessa Sochat",
Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
#!/bin/sh
2-
sudo apt-get update
3-
4-
sudo apt-get -y install git
5-
6-
sudo apt-get install -y build-essential libtool autotools-dev automake autoconf
7-
8-
sudo apt-get install -y python3-pip
9-
10-
cd /tmp && git clone http://www.github.com/singularityware/singularity
11-
12-
cd /tmp/singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
13-
14-
sudo pip3 install --upgrade pip
15-
16-
sudo pip3 install --upgrade google-api-python-client
17-
18-
sudo pip3 install --upgrade google
19-
20-
sudo pip3 install oauth2client==3.0.0
21-
22-
sudo pip3 install gitpython
23-
24-
sudo pip3 install singularity --upgrade
25-
2+
sudo apt-get update &&
3+
sudo apt-get -y install git \
4+
build-essential \
5+
libtool \
6+
autotools-dev \
7+
automake \
8+
autoconf \
9+
python3-pip
10+
11+
# Install Singularity from Github
12+
cd /tmp && git clone http://www.github.com/singularityware/singularity &&
13+
cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
14+
15+
# Pip3 installs
16+
sudo pip3 install --upgrade pip &&
17+
sudo pip3 install --upgrade google-api-python-client &&
18+
sudo pip3 install --upgrade google &&
19+
sudo pip3 install oauth2client==3.0.0 gitpython singularity
20+
21+
# Main running script
2622
python3 -c "from singularity.build.google import run_build; run_build()" > /tmp/.shub-log 2>&1
2723

28-
export command=$(echo "from singularity.build.google import finish_build; finish_build()")
29-
24+
# Finish by sending log
25+
export command=$(echo "from singularity.build.google import finish_build; finish_build()") &&
3026
python3 -c "$command"

0 commit comments

Comments
 (0)