Merge pull request #19 from joyent/fix-18-triton-docker-profile

Fix triton-docker profile
This commit is contained in:
Casey Bisson 2017-12-07 13:06:59 -08:00 committed by GitHub
commit 16b0aca67a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -71,7 +71,7 @@ function currentProfile () {
# Get and the user's account information and CloudAPI URL for parsing later # Get and the user's account information and CloudAPI URL for parsing later
local triton_account="$(triton account get)" local triton_account="$(triton account get)"
echo "Executing in '$(echo "${triton_account}" | awk 'NR == 1 {print $2}')' (${profile_source})" echo "Executing in '$(triton profile get | awk 'NR == 1 {print $2}')' (${profile_source})"
# Check if CNS is enabled, require it # Check if CNS is enabled, require it
if [ ! "true" == "$(echo "${triton_account}" | awk -F": " '/^triton_cns_enabled:/{print $2}')" ] if [ ! "true" == "$(echo "${triton_account}" | awk -F": " '/^triton_cns_enabled:/{print $2}')" ]