Skip to content

Commit

Permalink
Issue #66: Add environment variables used by conan-package-tools (#67)
Browse files Browse the repository at this point in the history
  * CONAN_USERNAME
  * CONAN_PIP_COMMAND
  * Closes #66

Signed-off-by: Mike Detwiler <[email protected]>
  • Loading branch information
detwiler authored Jul 8, 2019
1 parent d506c22 commit 708ad89
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 1 deletion.
10 changes: 10 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ QH_VAR_ENSURE([PS1_GIT_COLOR], [bash prompt git status color], [32])
QH_VAR_ENSURE([PS1_PWD_COLOR], [bash prompt pwd color], [0])
QH_VAR_ENSURE([PS1_AWS_COLOR], [bash prompt aws profile color], [33])

## conan ##

QH_VAR_ENSURE([CONAN_USERNAME],
[User name required by conan-package-tools],
[$USER])
QH_VAR_ENSURE([CONAN_PIP_COMMAND],
[Name of Python3 version of the pip command],
[pip3])

## coreutils ##

AC_CHECK_PROG([have_dircolors], [dircolors], [yes])
Expand Down Expand Up @@ -280,6 +289,7 @@ AC_CONFIG_FILES([Makefile
data/bash/common/bashrc.d/ls.sh
data/bash/common/bashrc.d/ps1.sh
data/bash/common/profile.d/Makefile
data/bash/common/profile.d/conan.sh
data/bash/common/profile.d/editor.sh
data/dircolors/Makefile
data/git/Makefile
Expand Down
1 change: 1 addition & 0 deletions data/bash/common/profile.d/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# .gitignore

# generated data files
conan.sh
editor.sh
go.sh
gnulib.sh
Expand Down
4 changes: 3 additions & 1 deletion data/bash/common/profile.d/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ include $(top_srcdir)/rules.mk
# data/script variables
bash = bash.sh
bash_completion = bash-completion.sh
conan = conan.sh
editor = editor.sh
info = info.sh
gnulib = gnulib.sh
Expand All @@ -24,7 +25,8 @@ endif
dist_profile_DATA = $(static_data)

# data/scripts generated by configure (source file automatically distributed)
conf_data = $(editor)
conf_data = $(conan) \
$(editor)

if HAVE_GNULIB_SRCDIR
conf_data += $(gnulib)
Expand Down
4 changes: 4 additions & 0 deletions data/bash/common/profile.d/conan.sh.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# gnulib settings

export CONAN_USERNAME=@CONAN_USERNAME@
export CONAN_PIP_COMMAND=@CONAN_PIP_COMMAND@

0 comments on commit 708ad89

Please sign in to comment.