source /etc/pgvmrc then $HOME/.pgvmrc if them exists. refs guedes#14,g…

…uedes#18
fabriziomello · Aug 6, 2012 · 150358e · 150358e
1 parent c6023f8
commit 150358e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/bin/pgvm b/bin/pgvm
@@ -23,10 +23,7 @@
 
 source $pgvm_home/include/helpers
 
-if [ -f ~/.pgvmrc ]
-then
-  source ~/.pgvmrc
-fi
+load_conf
 
 action=$1
 

diff --git a/include/helpers b/include/helpers
@@ -257,3 +257,18 @@ create_osx_md5()
 
     [[ ${md5hash[0]} == ${md5hash[2]} ]] && echo ${md5hash[1]}: "SUCCESS" || exit 1
 }
+
+load_conf()
+{
+    files="/etc/pgvmrc $HOME/.pgvmrc"
+
+    for file in $files
+    do
+        if [ -f $file ]
+        then
+            source $file
+            export PGVMRC=$file
+            break
+        fi
+    done
+}