[DRE-commits] [SCM] rbenv.git branch, master, updated. debian/0.1.2+git20100922-1-15-ga004426

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 0163741d5f76c8050e6b812b17fd188413aed2a4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jan 10 16:26:06 2012 -0200

    Import new version of rbenv-alternatives plugin

diff --git a/rbenv-alternatives/Makefile b/rbenv-alternatives/Makefile
new file mode 100644
index 0000000..347e13a
--- /dev/null
+++ b/rbenv-alternatives/Makefile
@@ -0,0 +1,17 @@
+PACKAGE = rbenv-alternatives
+VERSION = $(shell ./bin/rbenv-alternatives --version)
+TARBALL = $(PACKAGE)-$(VERSION).tar.gz
+DEBIAN_TARBALL = rbenv_$(VERSION).orig-$(PACKAGE).tar.gz
+
+dist: $(TARBALL)
+
+debian-dist: $(DEBIAN_TARBALL)
+
+$(TARBALL):
+	git archive --prefix=$(PACKAGE)-$(VERSION)/ HEAD | gzip - > $(TARBALL)
+
+$(DEBIAN_TARBALL): $(TARBALL)
+	ln $(TARBALL) $(DEBIAN_TARBALL)
+
+clean:
+	$(RM) $(TARBALL) $(DEBIAN_TARBALL)
diff --git a/rbenv-alternatives/README.md b/rbenv-alternatives/README.md
index 4ab2559..28b8448 100644
--- a/rbenv-alternatives/README.md
+++ b/rbenv-alternatives/README.md
@@ -15,8 +15,11 @@ environments.
 
 ## Installation
 
-Just copy `rbenv-alternatives` into any directory in your `$PATH`, after
-installing and setting up rbenv itself.
+If you have installed rbenv from source into ~/.rbenv, just create a symcolic
+link to where you download this plugin inside ~/.rbenv/plugins:
+
+    $ mkdir ~/.rbenv/plugins
+    $ ln -s /path/to/rbenv-alternatives ~/.rbenv/plugins
 
 If you install rbenv through APT, then it will already bring this plugin with
 it:
diff --git a/rbenv-alternatives/bin/rbenv-alternatives b/rbenv-alternatives/bin/rbenv-alternatives
index 2bd2299..657fd9c 100755
--- a/rbenv-alternatives/bin/rbenv-alternatives
+++ b/rbenv-alternatives/bin/rbenv-alternatives
@@ -2,14 +2,17 @@
 set -e
 [ -n "$RBENV_DEBUG" ] && set -x
 
+if [ "$1" == '--version' ]; then
+  echo '0.3.0'
+  exit 0
+fi
+
 if ! which update-alternatives >/dev/null; then
   echo "Sorry, it seems like you do not have update-alternatives available on your PATH."
   echo "Are you sure this is a Debian (or derivative) system?"
   exit 1
 fi
 
-rm -rf ${RBENV_ROOT}/versions/*-debian
-
 update-alternatives --query ruby | sed -e '
   1,/^$/ d
   /^Priority:/ d
@@ -22,16 +25,24 @@ while read command; do
     master*)
       master=$(echo "$command" | awk '{print $2}')
       version=$($master -e 'puts(((defined?(RUBY_ENGINE) && RUBY_ENGINE != "ruby") && RUBY_ENGINE + "-" || "") + (defined?(Rubinius) && Rubinius::VERSION || (defined?(JRUBY_VERSION) && JRUBY_VERSION) || RUBY_VERSION))')-debian
-      rm -rf "${RBENV_ROOT}/versions/$version"
-      mkdir -p "${RBENV_ROOT}/versions/$version/bin"
-      ln -s "$master" "${RBENV_ROOT}/versions/$version/bin/ruby"
-      ln -s "${master/ruby/gem}" "${RBENV_ROOT}/versions/$version/bin/gem"
-      echo "Added $version"
+      if [ -d "${RBENV_ROOT}/versions/$version" ]; then
+        skip=true
+        echo "Skipping $version, it already exists"
+      else
+        skip=false
+        rm -rf "${RBENV_ROOT}/versions/$version"
+        mkdir -p "${RBENV_ROOT}/versions/$version/bin"
+        ln -s "$master" "${RBENV_ROOT}/versions/$version/bin/ruby"
+        ln -s "${master/ruby/gem}" "${RBENV_ROOT}/versions/$version/bin/gem"
+        echo "Added $version"
+      fi
       ;;
     *)
-      prog=$(echo "$command" | awk '{print $1}')
-      target=$(echo "$command" | awk '{print $2}')
-      ln -s "$target" "${RBENV_ROOT}/versions/$version/bin/$prog"
+      if [ "$skip" = 'false' ]; then
+        prog=$(echo "$command" | awk '{print $1}')
+        target=$(echo "$command" | awk '{print $2}')
+        ln -s "$target" "${RBENV_ROOT}/versions/$version/bin/$prog"
+      fi
       ;;
   esac
 done

-- 
rbenv.git