__rvm: use shortcut version
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
parent
d97f6794d0
commit
c779e16fe2
2 changed files with 13 additions and 11 deletions
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# 2012 Evax Software <contact@evax.fr>
|
||||
# 2012 Nico Schottelius (nico-cdist at schottelius.org)
|
||||
#
|
||||
# This file is part of cdist.
|
||||
#
|
||||
|
@ -21,7 +22,9 @@
|
|||
user="$__object_id"
|
||||
state_is="$(cat "$__object/explorer/state")"
|
||||
state_should="$(cat "$__object/parameter/state")"
|
||||
if [ "$state_is" != "$state_should" ]; then
|
||||
|
||||
[ "$state_is" = "$state_should" ] && exit 0
|
||||
|
||||
case "$state_should" in
|
||||
present)
|
||||
cat << DONE
|
||||
|
@ -33,8 +36,6 @@ DONE
|
|||
su - $user -c "rm -Rf \"\\\$HOME/.rvm\";
|
||||
sed '/rvm\/scripts\/rvm/d' \"\\\$HOME/.bashrc\" > \"\\\$HOME/.bashrc.cdist-tmp\"
|
||||
mv \"\\\$HOME/.bashrc.cdist-tmp\" \"\\\$HOME/.bashrc\""
|
||||
|
||||
DONE
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
|
|
@ -9,6 +9,7 @@ Changelog
|
|||
* Core: Export PYTHONPATH, it's also needed by emulator
|
||||
* Bugfix Type __rvm_ruby: Add clean package dependencies
|
||||
* Bugfix Type __rvm_gem: Run rvm as user, not as root
|
||||
* Cleanup Type __rvm: Use shortcut version
|
||||
|
||||
2.1.0pre5: 2012-11-01
|
||||
* Core: First round of tests updated to work with multiple configuration directories
|
||||
|
|
Loading…
Reference in a new issue