From 579aef3a7b2711acd86b341222c0c7435af56467 Mon Sep 17 00:00:00 2001
From: Shintaro Katayama <shintaro.katayama@gmail.com>
Date: Thu, 26 Jul 2018 11:46:10 +0200
Subject: [PATCH 1/2] Add hooking to version-name and version-origin

---
 libexec/Renv-version-name   | 7 +++++++
 libexec/Renv-version-origin | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/libexec/Renv-version-name b/libexec/Renv-version-name
index d65a04c3d8..73314f53e0 100755
--- a/libexec/Renv-version-name
+++ b/libexec/Renv-version-name
@@ -7,6 +7,13 @@ if [ -z "$RENV_VERSION" ]; then
   RENV_VERSION="$(Renv-version-file-read "$RENV_VERSION_FILE" || true)"
 fi
 
+OLDIFS="$IFS"
+IFS=$'\n' scripts=(`Renv-hooks version-name`)
+IFS="$OLDIFS"
+for script in "${scripts[@]}"; do
+  source "$script"
+done
+
 if [ -z "$RENV_VERSION" ] || [ "$RENV_VERSION" = "system" ]; then
   echo "system"
   exit
diff --git a/libexec/Renv-version-origin b/libexec/Renv-version-origin
index fd0f2f1eac..f1a6eb5020 100755
--- a/libexec/Renv-version-origin
+++ b/libexec/Renv-version-origin
@@ -2,6 +2,13 @@
 set -e
 [ -n "$RENV_DEBUG" ] && set -x
 
+OLDIFS="$IFS"
+IFS=$'\n' scripts=(`Renv-hooks version-origin`)
+IFS="$OLDIFS"
+for script in "${scripts[@]}"; do
+  source "$script"
+done
+
 if [ -n "$RENV_VERSION" ]; then
   echo "RENV_VERSION environment variable"
 else

From f85b667b0875ddcaec58bc4f51712e4bb66674aa Mon Sep 17 00:00:00 2001
From: Shintaro Katayama <shintaro.katayama@gmail.com>
Date: Thu, 26 Jul 2018 13:18:14 +0200
Subject: [PATCH 2/2] Fix to refer RENV_VERSION_ORIGIN in version-origin

---
 libexec/Renv                | 2 +-
 libexec/Renv-version-origin | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libexec/Renv b/libexec/Renv
index 873fdb81d8..b18fceb7ed 100755
--- a/libexec/Renv
+++ b/libexec/Renv
@@ -60,7 +60,7 @@ shopt -u nullglob
 command="$1"
 case "$command" in
 "" | "-h" | "--help" )
-  echo -e "Renv 0.3.0\n$(Renv-help)" >&2
+  echo -e "Renv 0.3.1\n$(Renv-help)" >&2
   ;;
 * )
   command_path="$(command -v "Renv-$command" || true)"
diff --git a/libexec/Renv-version-origin b/libexec/Renv-version-origin
index f1a6eb5020..6063b25d4e 100755
--- a/libexec/Renv-version-origin
+++ b/libexec/Renv-version-origin
@@ -2,6 +2,8 @@
 set -e
 [ -n "$RENV_DEBUG" ] && set -x
 
+unset RENV_VERSION_ORIGIN
+
 OLDIFS="$IFS"
 IFS=$'\n' scripts=(`Renv-hooks version-origin`)
 IFS="$OLDIFS"
@@ -9,7 +11,9 @@ for script in "${scripts[@]}"; do
   source "$script"
 done
 
-if [ -n "$RENV_VERSION" ]; then
+if [ -n "$RENV_VERSION_ORIGIN" ]; then
+  echo "$RENV_VERSION_ORIGIN"  
+elif [ -n "$RENV_VERSION" ]; then
   echo "RENV_VERSION environment variable"
 else
   Renv-version-file