fnux/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'evax/rvm-types'

Browse source
This commit is contained in:
Nico Schottelius 2012-01-19 13:11:25 +01:00
commit 9965dc3da4
8 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf/type/__rvm_gem/explorer/state
View file

@ -23,13 +23,13 @@ gemset="$(cat "$__object/parameter/gemset")"
ruby="$(echo "$gemset" | cut -d '@' -f 1)" ruby="$(echo "$gemset" | cut -d '@' -f 1)"
gemsetname="$(echo "$gemset" | cut -d '@' -f2)" gemsetname="$(echo "$gemset" | cut -d '@' -f2)"
user="$(cat "$__object/parameter/user")" user="$(cat "$__object/parameter/user")"
if su - $user -c "[ ! -d \"\$HOME/.rvm\" ]" ; then if su - "$user" -c "[ ! -d \"\$HOME/.rvm\" ]" ; then
echo "removed" echo "removed"
exit 0 exit 0
fi fi
if su - $user -c "source \"\$HOME/.rvm/scripts/rvm\" if su - "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
rvm list | grep -q $ruby"; then rvm list | grep -q $ruby"; then
if su - $user -c "source \"\$HOME/.rvm/scripts/rvm\" if su - "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
rvm use $ruby > /dev/null; rvm gemset list | grep -q $gemsetname && rvm use $ruby > /dev/null; rvm gemset list | grep -q $gemsetname &&
rvm use $gemset > /dev/null && gem list | grep -q $gem"; then rvm use $gemset > /dev/null && gem list | grep -q $gem"; then
echo "installed" echo "installed"

4
conf/type/__rvm_gem/gencode-remote
View file

@ -29,13 +29,13 @@ if [ "$state_is" != "$state_should" ]; then
case "$state_should" in case "$state_should" in
installed) installed)
cat << DONE cat << DONE
su - $user -c "source \"\\\$HOME/.rvm/scripts/rvm\" su - "$user" -c "source \"\\\$HOME/.rvm/scripts/rvm\"
rvm use $gemset; gem install $gem" rvm use $gemset; gem install $gem"
DONE DONE
;; ;;
removed) removed)
cat << DONE cat << DONE
su - $user -c "source \"\\\$HOME/.rvm/scripts/rvm\" su - "$user" -c "source \"\\\$HOME/.rvm/scripts/rvm\"
rvm use $gemset; gem uninstall $gem" rvm use $gemset; gem uninstall $gem"
DONE DONE
;; ;;

6
conf/type/__rvm_gem/manifest
View file

@ -31,8 +31,8 @@ else
echo $default > "$__object/parameter/default" echo $default > "$__object/parameter/default"
fi fi
__rvm $user --state installed __rvm "$user" --state installed
require="__rvm/$user" \ require="__rvm/$user" \
__rvm_ruby $ruby --user $user --state installed --default $default __rvm_ruby $ruby --user "$user" --state installed --default $default
require="__rvm_ruby/$ruby" \ require="__rvm_ruby/$ruby" \
__rvm_gemset $gemset --user $user --state installed --default $default __rvm_gemset $gemset --user "$user" --state installed --default $default

6
conf/type/__rvm_gemset/explorer/state
View file

@ -22,13 +22,13 @@ gemset="$__object_id"
ruby="$(echo "$gemset" | cut -d '@' -f 1)" ruby="$(echo "$gemset" | cut -d '@' -f 1)"
gemsetname="$(echo "$gemset" | cut -d '@' -f2)" gemsetname="$(echo "$gemset" | cut -d '@' -f2)"
user="$(cat "$__object/parameter/user")" user="$(cat "$__object/parameter/user")"
if su - $user -c "[ ! -d \"\$HOME/.rvm\" ]" ; then if su - "$user" -c "[ ! -d \"\$HOME/.rvm\" ]" ; then
echo "removed" echo "removed"
exit 0 exit 0
fi fi
if su - $user -c "source \"\$HOME/.rvm/scripts/rvm\" if su - "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
rvm list | grep -q $ruby"; then rvm list | grep -q $ruby"; then
if su - $user -c "source \"\$HOME/.rvm/scripts/rvm\" if su - "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
rvm use $ruby > /dev/null; rvm gemset list | grep -q $gemsetname"; then rvm use $ruby > /dev/null; rvm gemset list | grep -q $gemsetname"; then
echo "installed" echo "installed"
exit 0 exit 0

7
conf/type/__rvm_gemset/gencode-remote
View file

@ -23,12 +23,13 @@ ruby="$(echo "$gemset" | cut -d '@' -f 1)"
gemsetname="$(echo "$gemset" | cut -d '@' -f 2)" gemsetname="$(echo "$gemset" | cut -d '@' -f 2)"
state_is="$(cat "$__object/explorer/state")" state_is="$(cat "$__object/explorer/state")"
user="$(cat "$__object/parameter/user")" user="$(cat "$__object/parameter/user")"
default="$(cat "$__object/parameter/default")"
state_should="$(cat "$__object/parameter/state")" state_should="$(cat "$__object/parameter/state")"
if [ "$state_is" != "$state_should" ]; then if [ "$state_is" != "$state_should" ]; then
case "$state_should" in case "$state_should" in
installed) installed)
cat << DONE cat << DONE
su - $user -c "source \"\\\$HOME/.rvm/scripts/rvm\" su - "$user" -c "source \"\\\$HOME/.rvm/scripts/rvm\"
rvm $gemset --create" rvm $gemset --create"
DONE DONE
case "$default" in case "$default" in
@ -36,7 +37,7 @@ DONE
;; ;;
*) *)
cat << DONE cat << DONE
su - $user -c "source \"\\\$HOME/.rvm/scripts/rvm\" su - "$user" -c "source \"\\\$HOME/.rvm/scripts/rvm\"
rvm use --default $gemset" rvm use --default $gemset"
DONE DONE
;; ;;
@ -44,7 +45,7 @@ DONE
;; ;;
removed) removed)
cat << DONE cat << DONE
su - $user -c "source \"\\\$HOME/.rvm/scripts/rvm\" su - "$user" -c "source \"\\\$HOME/.rvm/scripts/rvm\"
rvm use $ruby; rvm --force gemset delete $gemsetname" rvm use $ruby; rvm --force gemset delete $gemsetname"
DONE DONE
;; ;;

5
conf/type/__rvm_gemset/manifest
View file

@ -27,9 +27,10 @@ if [ -f "$__object/parameter/default" ]; then
default="$(cat "$__object/parameter/default")" default="$(cat "$__object/parameter/default")"
else else
default="no" default="no"
echo $default > "$__object/parameter/default"
fi fi
__rvm $user --state installed __rvm "$user" --state installed
require="__rvm/$user" \ require="__rvm/$user" \
__rvm_ruby $ruby --user $user --state installed --default $default __rvm_ruby $ruby --user "$user" --state installed --default $default

4
conf/type/__rvm_ruby/explorer/state
View file

@ -20,11 +20,11 @@
ruby="$__object_id" ruby="$__object_id"
user="$(cat "$__object/parameter/user")" user="$(cat "$__object/parameter/user")"
if su - $user -c "[ ! -d \"\$HOME/.rvm\" ]" ; then if su - "$user" -c "[ ! -d \"\$HOME/.rvm\" ]" ; then
echo "removed" echo "removed"
exit 0 exit 0
fi fi
if su - $user -c "source \"\$HOME/.rvm/scripts/rvm\" if su - "$user" -c "source \"\$HOME/.rvm/scripts/rvm\"
rvm list | grep -q $ruby"; then rvm list | grep -q $ruby"; then
echo "installed" echo "installed"
else else

6
conf/type/__rvm_ruby/gencode-remote
View file

@ -26,19 +26,19 @@ state_should="$(cat "$__object/parameter/state")"
if [ "$state_is" != "$state_should" ]; then if [ "$state_is" != "$state_should" ]; then
case "$state_should" in case "$state_should" in
installed) installed)
echo "su - $user -c \"source \\\$HOME/.rvm/scripts/rvm;"\ echo "su - \"$user\" -c \"source \\\$HOME/.rvm/scripts/rvm;"\
"rvm install $ruby\"" "rvm install $ruby\""
case "$default" in case "$default" in
no) no)
;; ;;
*) *)
echo "su - $user -c \"source \\\$HOME/.rvm/scripts/rvm;"\ echo "su - \"$user\" -c \"source \\\$HOME/.rvm/scripts/rvm;"\
"rvm use --default $ruby\"" "rvm use --default $ruby\""
;; ;;
esac esac
;; ;;
removed) removed)
echo "su - $user -c \"source \\\$HOME/.rvm/scripts/rvm;"\ echo "su - \"$user\" -c \"source \\\$HOME/.rvm/scripts/rvm;"\
"rvm remove $ruby\"" "rvm remove $ruby\""
;; ;;
esac esac