Download as
Browse Code »

Commit 3ded9ec6afcbcf6475050c5be72df0434ee8d305

Authored by Sergio Oliveira
1 parent 86ba2eb9
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

Drop usage of `readlink -f` 

Not portable to *BSD
Showing 3 changed files with 9 additions and 4 deletions   Show diff stats
server
  Diff comments   View file @3ded9ec
1 1 #!/bin/sh
2 2  
3   -ROOTDIR="$(readlink -f $(dirname $0))"
4   -. $ROOTDIR/test/ip_helper.sh
  3 +if [ -f test/ip_helper.sh ]; then
  4 + ROOTDIR=$(dirname $0)
  5 + . test/ip_helper.sh
  6 +else
  7 + echo "E: must run $0 from the root of the repository!"
  8 + exit 1
  9 +fi
5 10  
6 11 sudo -v
7 12 sudo redir --lport 80 --cport 80 --caddr $reverseproxy &
... ...
test/bin/curl
  Diff comments   View file @3ded9ec
... ... @@ -5,7 +5,7 @@ set -e
5 5 unset http_proxy
6 6 unset https_proxy
7 7  
8   -ROOTDIR=$(readlink -f $(dirname $0)/../..)
  8 +ROOTDIR=$(dirname $0)/../..
9 9 . $(dirname $0)/../ip_helper.sh
10 10  
11 11 /usr/bin/curl \
... ...
test/test_helper.sh
  Diff comments   View file @3ded9ec
1 1 export PATH="$(dirname $0)/bin:$PATH"
2   -export ROOTDIR="$(readlink -f $(dirname $0)/..)"
  2 +export ROOTDIR="$(dirname $0)/.."
3 3  
4 4 run_on() {
5 5 local vm="$1"
... ...