Download as
Browse Code »

Commit 429bc4ce7e45900e27e4590184bd6866d1b37033

Authored by Antonio Terceiro
1 parent 80ac628c
Exists in master and in 90 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

use JSON for config file + http_proxy

Showing 1 changed file with 18 additions and 9 deletions   Show diff stats
dev-install.sh
  Diff comments   View file @429bc4c
@@ -7,17 +7,26 @@ host=$(vagrant ssh-config | awk '{ if ($1 == "HostName") { print($2) }}') @@ -7,17 +7,26 @@ host=$(vagrant ssh-config | awk '{ if ($1 == "HostName") { print($2) }}')
7 port=$(vagrant ssh-config | awk '{ if ($1 == "Port") { print($2) }}') 7 port=$(vagrant ssh-config | awk '{ if ($1 == "Port") { print($2) }}')
8 key=$(vagrant ssh-config | awk '{ if ($1 == "IdentityFile") { print($2) }}') 8 key=$(vagrant ssh-config | awk '{ if ($1 == "IdentityFile") { print($2) }}')
9 9
10 -cat > colab/environments.yml <<EOF  
11 -dev:  
12 - hosts:  
13 - - $host  
14 - key_filename: $key  
15 - port: $port  
16 - is_vagrant: True  
17 - superuser: 'vagrant' 10 +if [ -n "$http_proxy" ]; then
  11 + proxy="\"command_prefixes\": [\"http_proxy='$http_proxy'\"],"
  12 +else
  13 + proxy=
  14 +fi
  15 +
  16 +cat > colab/environments.json <<EOF
  17 +{
  18 + "dev": {
  19 + $proxy
  20 + "hosts": ["$host"],
  21 + "key_filename": "$key",
  22 + "port": "$port",
  23 + "is_vagrant": true,
  24 + "superuser": "vagrant"
  25 + }
  26 +}
18 EOF 27 EOF
19 28
20 -sudo apt-get install -qy python-yaml fabric 29 +dpkg-query --show fabric >/dev/null || sudo apt-get install -qy fabric
21 30
22 ( 31 (
23 cd colab 32 cd colab