[MediaWiki-commits] [Gerrit] base: bash.bashrc ERB variable qualifiers - change (operations/puppet)

2015-04-17 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has submitted this change and it was merged.

Change subject: base: bash.bashrc ERB variable qualifiers
..


base: bash.bashrc ERB variable qualifiers

Change-Id: I00195ede158fc669157caf7635c3fbc34c7bc6b2
---
M modules/base/templates/environment/bash.bashrc
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/base/templates/environment/bash.bashrc 
b/modules/base/templates/environment/bash.bashrc
index c24fd2c..5eab4f8 100644
--- a/modules/base/templates/environment/bash.bashrc
+++ b/modules/base/templates/environment/bash.bashrc
@@ -29,14 +29,14 @@
 # set a fancy prompt (non-color, overwrite the one in /etc/profile)
 
 % if has_variable?(instancename) then %
-export INSTANCENAME=%= instancename %
+export INSTANCENAME=%= @instancename %
 PS1='${debian_chroot:+($debian_chroot)}\u@${INSTANCENAME}:\w\$ '
 % else %
 PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 % end %
 
 % if has_variable?(instanceproject) then %
-export INSTANCEPROJECT=%= instanceproject %
+export INSTANCEPROJECT=%= @instanceproject %
 % end %
 
 # Commented out, don't overwrite xterm -T title -n icontitle by default.

-- 
To view, visit https://gerrit.wikimedia.org/r/204740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I00195ede158fc669157caf7635c3fbc34c7bc6b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] base: bash.bashrc ERB variable qualifiers - change (operations/puppet)

2015-04-17 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/204740

Change subject: base: bash.bashrc ERB variable qualifiers
..

base: bash.bashrc ERB variable qualifiers

Change-Id: I00195ede158fc669157caf7635c3fbc34c7bc6b2
---
M modules/base/templates/environment/bash.bashrc
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/204740/1

diff --git a/modules/base/templates/environment/bash.bashrc 
b/modules/base/templates/environment/bash.bashrc
index c24fd2c..5eab4f8 100644
--- a/modules/base/templates/environment/bash.bashrc
+++ b/modules/base/templates/environment/bash.bashrc
@@ -29,14 +29,14 @@
 # set a fancy prompt (non-color, overwrite the one in /etc/profile)
 
 % if has_variable?(instancename) then %
-export INSTANCENAME=%= instancename %
+export INSTANCENAME=%= @instancename %
 PS1='${debian_chroot:+($debian_chroot)}\u@${INSTANCENAME}:\w\$ '
 % else %
 PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 % end %
 
 % if has_variable?(instanceproject) then %
-export INSTANCEPROJECT=%= instanceproject %
+export INSTANCEPROJECT=%= @instanceproject %
 % end %
 
 # Commented out, don't overwrite xterm -T title -n icontitle by default.

-- 
To view, visit https://gerrit.wikimedia.org/r/204740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00195ede158fc669157caf7635c3fbc34c7bc6b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits