From: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
Date: Mon, 1 Jun 2015 22:05:32 +0000 (-0700)
Subject: ceph-post-file: improve check for a source install
X-Git-Tag: v0.80.11~77^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc59ca391f639b2ef1b5c9dda202a3d7d718cf25;p=ceph.git

ceph-post-file: improve check for a source install

Signed-off-by: Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
(cherry picked from commit ee170eadcdcb4b54d36a7d474558484de9d917eb)
---

diff --git a/src/ceph-post-file.in b/src/ceph-post-file.in
index fed1666ae8f..b278e8abd95 100755
--- a/src/ceph-post-file.in
+++ b/src/ceph-post-file.in
@@ -1,16 +1,16 @@
 #!/bin/bash -e
 
-# if we start up as ./$0, assume we are running from a source
-# checkout.
-if [ `dirname $0` = "." ] && [ $PWD != "/usr/bin" ]; then
-    known_hosts=../share/known_hosts_drop.ceph.com
-    ssh_key=../share/id_dsa_drop.ceph.com
-else
-    known_hosts=@datadir@/known_hosts_drop.ceph.com
-    ssh_key=@datadir@/id_dsa_drop.ceph.com
+# If these files exist, assume we are a source install.
+if [[ -f ../share/known_hosts_drop.ceph.com && -f ../share/id_dsa_drop.ceph.com ]]
+    then # running from source install
+       known_hosts=../share/known_hosts_drop.ceph.com
+       ssh_key=../share/id_dsa_drop.ceph.com
+    else # running from a pkg install
+       known_hosts=@datadir@/known_hosts_drop.ceph.com
+       ssh_key=@datadir@/id_dsa_drop.ceph.com
 fi
 
-usage() {
+function usage() {
     echo "Usage: $0 [options] file1 [dir2 ...]
 
 Easily upload files or directories to ceph.com for analysis by Ceph