From 708ad8989407cd06c6776e456b1782ebd487e173 Mon Sep 17 00:00:00 2001
From: Mike Detwiler <mike@detwiler.io>
Date: Mon, 8 Jul 2019 13:03:51 -0400
Subject: [PATCH] Issue #66: Add environment variables used by
 conan-package-tools (#67)

  * CONAN_USERNAME
  * CONAN_PIP_COMMAND
  * Closes #66

Signed-off-by: Mike Detwiler <mike@detwiler.io>
---
 configure.ac                           | 10 ++++++++++
 data/bash/common/profile.d/.gitignore  |  1 +
 data/bash/common/profile.d/Makefile.am |  4 +++-
 data/bash/common/profile.d/conan.sh.in |  4 ++++
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 data/bash/common/profile.d/conan.sh.in

diff --git a/configure.ac b/configure.ac
index 5442c61..362949d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
@@ -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
diff --git a/data/bash/common/profile.d/.gitignore b/data/bash/common/profile.d/.gitignore
index aa6199c..20c9c05 100644
--- a/data/bash/common/profile.d/.gitignore
+++ b/data/bash/common/profile.d/.gitignore
@@ -1,6 +1,7 @@
 # .gitignore
 
 # generated data files
+conan.sh
 editor.sh
 go.sh
 gnulib.sh
diff --git a/data/bash/common/profile.d/Makefile.am b/data/bash/common/profile.d/Makefile.am
index c5e0f67..219fd93 100644
--- a/data/bash/common/profile.d/Makefile.am
+++ b/data/bash/common/profile.d/Makefile.am
@@ -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
@@ -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)
diff --git a/data/bash/common/profile.d/conan.sh.in b/data/bash/common/profile.d/conan.sh.in
new file mode 100644
index 0000000..0e67ca3
--- /dev/null
+++ b/data/bash/common/profile.d/conan.sh.in
@@ -0,0 +1,4 @@
+# gnulib settings
+
+export CONAN_USERNAME=@CONAN_USERNAME@
+export CONAN_PIP_COMMAND=@CONAN_PIP_COMMAND@