From 28b19b9e20100236f98e04cc43bcf106768ff2bb Mon Sep 17 00:00:00 2001
From: "Dave Walker (Daviey)" <DaveWalker@ubuntu.com>
Date: Fri, 27 May 2011 15:28:10 +0100
Subject: nova/auth/novarc.template: Changed NOVA_KEY_DIR to allow symlink
 support

---
 nova/auth/novarc.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/auth')

diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template
index cda2ecc28..8170fcafe 100644
--- a/nova/auth/novarc.template
+++ b/nova/auth/novarc.template
@@ -1,4 +1,4 @@
-NOVA_KEY_DIR=$(pushd $(dirname $BASH_SOURCE)>/dev/null; pwd; popd>/dev/null)
+NOVA_KEY_DIR=$(dirname $(readlink -f ${BASH_SOURCE}))
 export EC2_ACCESS_KEY="%(access)s:%(project)s"
 export EC2_SECRET_KEY="%(secret)s"
 export EC2_URL="%(ec2)s"
-- 
cgit 


From ef1f5b3aadde2fedb4b2d197af0f1c0f07375714 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 1 Jun 2011 16:51:26 -0700
Subject: fix novarc to work on mac and zsh

---
 nova/auth/novarc.template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova/auth')

diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template
index 8170fcafe..4a1f41802 100644
--- a/nova/auth/novarc.template
+++ b/nova/auth/novarc.template
@@ -1,4 +1,5 @@
-NOVA_KEY_DIR=$(dirname $(readlink -f ${BASH_SOURCE}))
+NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' ${BASH_SOURCE-0})
+NOVA_KEY_DIR=$(dirname ${NOVARC})
 export EC2_ACCESS_KEY="%(access)s:%(project)s"
 export EC2_SECRET_KEY="%(secret)s"
 export EC2_URL="%(ec2)s"
-- 
cgit 


From 8ee41f679bd72af6aab098f9d9735e342b281635 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 1 Jun 2011 18:55:41 -0700
Subject: missed a couple chars

---
 nova/auth/novarc.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/auth')

diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template
index 4a1f41802..92eed3520 100644
--- a/nova/auth/novarc.template
+++ b/nova/auth/novarc.template
@@ -1,4 +1,4 @@
-NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' ${BASH_SOURCE-0})
+NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' ${BASH_SOURCE:-$0})
 NOVA_KEY_DIR=$(dirname ${NOVARC})
 export EC2_ACCESS_KEY="%(access)s:%(project)s"
 export EC2_SECRET_KEY="%(secret)s"
-- 
cgit 


From be2f5e986e41f8f8d63c0ef7a5c03916c70ba455 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 2 Jun 2011 10:20:26 -0700
Subject: don't use python if readlink is available

---
 nova/auth/novarc.template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'nova/auth')

diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template
index 92eed3520..d30bd849c 100644
--- a/nova/auth/novarc.template
+++ b/nova/auth/novarc.template
@@ -1,5 +1,6 @@
-NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' ${BASH_SOURCE:-$0})
-NOVA_KEY_DIR=$(dirname ${NOVARC})
+NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
+    NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
+NOVA_KEY_DIR=${NOVARC%/*}
 export EC2_ACCESS_KEY="%(access)s:%(project)s"
 export EC2_SECRET_KEY="%(secret)s"
 export EC2_URL="%(ec2)s"
-- 
cgit 


From 28320ced7afb2c224ab4e1cfb8a607646a2bd2e3 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 2 Jun 2011 11:28:41 -0700
Subject: use %% because % is a replacement string character

---
 nova/auth/novarc.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/auth')

diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template
index d30bd849c..eba3a8537 100644
--- a/nova/auth/novarc.template
+++ b/nova/auth/novarc.template
@@ -1,6 +1,6 @@
 NOVARC=$(readlink -f "${BASH_SOURCE:-${0}}" 2>/dev/null) ||
     NOVARC=$(python -c 'import os,sys; print os.path.abspath(os.path.realpath(sys.argv[1]))' "${BASH_SOURCE:-${0}}")
-NOVA_KEY_DIR=${NOVARC%/*}
+NOVA_KEY_DIR=${NOVARC%%/*}
 export EC2_ACCESS_KEY="%(access)s:%(project)s"
 export EC2_SECRET_KEY="%(secret)s"
 export EC2_URL="%(ec2)s"
-- 
cgit