Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Side by Side Diff: ports/devenv/setup-environment

Issue 1071783003: Add root certificate bundle to curl package, and improve git default setup. (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« ports/devenv/bashrc ('K') | « ports/devenv/bashrc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # Copyright (c) 2014 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # This script is intended to be sourced. 6 # This script is intended to be sourced.
7 # It scans your packages and adds the appropriate things to the environment. 7 # It scans your packages and adds the appropriate things to the environment.
8 8
9 export TOOLCHAIN=@TOOLCHAIN@ 9 export TOOLCHAIN=@TOOLCHAIN@
10 10
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 export RUBYLIB=${RUBYLIB}:${RUBYLIB}/${NACL_ARCH}-nacl 49 export RUBYLIB=${RUBYLIB}:${RUBYLIB}/${NACL_ARCH}-nacl
50 alias ruby='ruby /bin/irb' 50 alias ruby='ruby /bin/irb'
51 alias emacs='ENABLE_CONTROL_C=0 emacs' 51 alias emacs='ENABLE_CONTROL_C=0 emacs'
52 52
53 # Make vim emit directly until we have pipes. 53 # Make vim emit directly until we have pipes.
54 export PAGER=cat 54 export PAGER=cat
55 55
56 # Allow ctrl-c to work. 56 # Allow ctrl-c to work.
57 export ENABLE_CONTROL_C=1 57 export ENABLE_CONTROL_C=1
58 58
59 # Point git and curl at root certificates.
60 export GIT_SSL_CAINFO=/mnt/html5/packages/curl.${NACL_ARCH}/ca-bundle.crt
61 export CURL_CA_BUNDLE=/mnt/html5/packages/curl.${NACL_ARCH}/ca-bundle.crt
Sam Clegg 2015/04/08 23:35:00 Is there a standard place in the filesystem where
bradn 2015/04/09 00:07:21 Done.
62
59 # Scan through packages. 63 # Scan through packages.
60 for package_dir in /mnt/html5/packages/*; do 64 for package_dir in /mnt/html5/packages/*; do
61 # Find the name of the package. 65 # Find the name of the package.
62 package=${package_dir##*/} 66 package=${package_dir##*/}
63 package_root=${package%.*} 67 package_root=${package%.*}
64 # Figure out the main package dir. 68 # Figure out the main package dir.
65 if [ -d ${package_dir}/${package_root} ]; then 69 if [ -d ${package_dir}/${package_root} ]; then
66 package_inside=${package_dir}/${package_root} 70 package_inside=${package_dir}/${package_root}
67 else 71 else
68 package_inside=${package_dir} 72 package_inside=${package_dir}
69 fi 73 fi
70 74
71 # Add package to the path and library path. 75 # Add package to the path and library path.
72 export PATH=${PATH}:${package_inside} 76 export PATH=${PATH}:${package_inside}
73 package_libs=${package_inside}/${PACKAGE_LIB_DIR} 77 package_libs=${package_inside}/${PACKAGE_LIB_DIR}
74 if [ -d ${package_libs} ]; then 78 if [ -d ${package_libs} ]; then
75 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${package_libs} 79 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${package_libs}
76 fi 80 fi
77 # Add optional platform specific library path. 81 # Add optional platform specific library path.
78 package_libs=${package_inside}/${PACKAGE_ALT_LIB_DIR} 82 package_libs=${package_inside}/${PACKAGE_ALT_LIB_DIR}
79 if [ -d ${package_libs} ]; then 83 if [ -d ${package_libs} ]; then
80 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${package_libs} 84 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${package_libs}
81 fi 85 fi
82 done 86 done
OLDNEW
« ports/devenv/bashrc ('K') | « ports/devenv/bashrc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698