Merge branch 'master' of github.com:guedes/pgvm

Author: guedes

CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.2.2-dev
+
+* Bug fixes
+  * Fix uninstall to proper purge files.
+
 # v0.2.1 (2013-12-08)
 
 * Enhancements

README.md

@@ -284,7 +284,7 @@ See the [issue list of enhancements](https://github.com/guedes/pgvm/issues?label
 Origins
 -------
 
-`pgvm` was inspired by [rvm](https://rvm.beginrescueend.com), a Ruby enVironment Manager created by [Wayne E. Seguin](http://wayneseguin.us).
+`pgvm` was inspired by [rvm](https://rvm.io), a Ruby enVironment Manager created by [Wayne E. Seguin](http://wayneseguin.us).
 
 
 Copyright and License

actions/uninstall

@@ -69,7 +69,12 @@ remove()
 	  break
   elif [ $version == "--all" ]
   then
-	  echo -e "Removing the following Postgres versions sources and installed by pgvm!\n"
+    if [ $purge -eq 1 ]
+    then
+      echo -e "Removing the following Postgres versions sources and installed by pgvm!\n"
+    else
+      echo -e "Removing the following Postgres versions installed by pgvm!\n"
+    fi
 	  echo -e "$VERSIONS"
 	  rm -rf ${pgvm_environments}/*
     if [ $purge -eq 1 ]
@@ -90,7 +95,12 @@ remove()
       break
     fi
 
-	  echo -e "Removing Postgres version $version installed and your source by pgvm!\n"
+    if [ $purge -eq 1 ]
+    then
+      echo -e "Removing Postgres version $version installed and your source by pgvm!\n"
+    else
+      echo -e "Removing Postgres version $version installed by pgvm!\n"
+    fi
     rm -rf ${pgvm_environments}/$version
 
     if [ $purge -eq 1 ]
@@ -116,14 +126,16 @@ uninstall()
 
   force=0
   purge=0
+  opt_force=0
+  opt_purge=0
 
   parse_options $*
 
-  if [ -n $opt_purge ]
+  if [ $opt_purge -ne 0 ]
   then
     purge=1
   fi
-  if [ -n $opt_force ]
+  if [ $opt_force -ne 0 ]
   then
     force=1
   fi