85e893c Rename ENV to PKG_ENV to not conflict with sh(1)'s ENV — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Rename ENV to PKG_ENV to not conflict with sh(1)'s ENV

Bryan Drewery committed 12 years ago

commit 85e893c39637478638ffb81bfa69aea4d43416c3
parent c4a95b5

3 files changed +3 -3

modified libpkg/pkg_config.c

@@ -264,7 +264,7 @@ static struct config_entry c[] = {

 	},
 	[PKG_CONFIG_ENV] = {
 		PKG_CONFIG_KVLIST,
 		"ENV",
 		"PKG_ENV",
 		NULL,
 		"Environment variables pkg will use",
 	},

modified pkg/pkg.conf.5

@@ -146,7 +146,7 @@ when running one of:

 or
 .Nm pkg version -R .
 (default: YES)
 .It Cm ENV: Key/Value list
 .It Cm PKG_ENV: Key/Value list
 This tells
 .Xr pkg 8
 to set key/values passed in the environment.

modified tests/frontend/pkg.sh

@@ -68,7 +68,7 @@ pkg_config_defaults_body()

 	-o match:'^UNSET_TIMESTAMP: no$' \
 	-o match:'^SSH_RESTRICT_DIR: $' \
 	-o match:'^REPOS_DIR: /usr/local/etc/pkg/repos/$' \
 	-o match:'^ENV:$' \
 	-o match:'^PKG_ENV:$' \
 	-o match:'^DISABLE_MTREE: no$' \
 	-e empty              \
 	-s exit:0             \