mix.sh in server-blender-0.0.13

- old
+ new

@@ -1,9 +1,9 @@
 #!/bin/bash -eu
 
 SHADOW_PUPPET_VERSION="0.3.2"
-MANIFEST_VERSION="0.0.12"
+MANIFEST_VERSION="0.0.14"
 
 trap "echo FAILED" EXIT
 
 # ensure_gem GEM [VERSION]
 function ensure_gem()
@@ -21,16 +21,30 @@
 			gem install --no-ri --no-rdoc $1
 		fi
 	fi
 }
 
+function use_system_ruby() {
+	if [ -e /usr/local/rvm ]; then
+		echo RVM: Switch to system ruby
+		set +eu
+		. /usr/local/rvm/scripts/rvm
+		rvm use system
+		set -eu
+	fi
+}
+
+use_system_ruby
 ensure_gem shadow_puppet $SHADOW_PUPPET_VERSION
 ensure_gem ruby-debug
 ensure_gem server-blender-manifest $MANIFEST_VERSION
 
 echo "Mix: [recipe: $RECIPE, node: ${NODE:-}, roles: ${ROLES:-}]"
 
+# rvm substitutes cd with its scripts/cd which accesses unbound variables
+set +u
 cd /var/lib/blender/recipes
+set -u
 
 ruby -rrubygems <<-RUBY
 gem 'server-blender-manifest', '$MANIFEST_VERSION'
 require 'blender/manifest'
 Blender::Manifest.run("${SHADOW_PUPPET_VERSION}") || exit(1)