Revision 4daf507c ci/utils.py
| b/ci/utils.py | ||
|---|---|---|
| 341 | 341 |
_run(cmd, False) |
| 342 | 342 |
|
| 343 | 343 |
# Setup apt, download packages |
| 344 |
self.logger.debug("Setup apt. Install x2goserver and firefox")
|
|
| 344 |
self.logger.debug("Setup apt")
|
|
| 345 | 345 |
cmd = """ |
| 346 | 346 |
echo 'APT::Install-Suggests "false";' >> /etc/apt/apt.conf |
| 347 | 347 |
echo 'precedence ::ffff:0:0/96 100' >> /etc/gai.conf |
| 348 | 348 |
apt-get update |
| 349 |
apt-get install curl --yes --force-yes |
|
| 349 |
apt-get install -q=2 curl --yes --force-yes
|
|
| 350 | 350 |
echo -e "\n\n{0}" >> /etc/apt/sources.list
|
| 351 | 351 |
# Synnefo repo's key |
| 352 | 352 |
curl https://dev.grnet.gr/files/apt-grnetdev.pub | apt-key add - |
| 353 |
""".format(self.config.get('Global', 'apt_repo'))
|
|
| 354 |
_run(cmd, False) |
|
| 353 | 355 |
|
| 356 |
cmd = """ |
|
| 354 | 357 |
# X2GO Key |
| 355 | 358 |
apt-key adv --recv-keys --keyserver keys.gnupg.net E1F958385BFE2B6E |
| 356 | 359 |
apt-get install x2go-keyring --yes --force-yes |
| ... | ... | |
| 369 | 372 |
echo 'Encoding=UTF-8' >> /usr/share/applications/xterm.desktop |
| 370 | 373 |
echo 'Icon=xterm-color_48x48' >> /usr/share/applications/xterm.desktop |
| 371 | 374 |
echo 'Categories=System;TerminalEmulator;' >> \ |
| 372 |
/usr/share/applications/xterm.desktop |
|
| 373 |
""".format(self.config.get('Global', 'apt_repo'))
|
|
| 374 |
_run(cmd, False) |
|
| 375 |
/usr/share/applications/xterm.desktop""" |
|
| 376 |
if self.config.get("Global", "setup_x2go") == "True":
|
|
| 377 |
self.logger.debug("Install x2goserver and firefox")
|
|
| 378 |
_run(cmd, False) |
|
| 375 | 379 |
|
| 376 | 380 |
def _find_flavor(self, flavor=None): |
| 377 | 381 |
"""Find a suitable flavor to use |
Also available in: Unified diff