mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
helpers2.1: $YNH_APP_INSTANCE_NAME -> $app
This commit is contained in:
parent
0ceb77ec34
commit
8c3ca4a0f4
1 changed files with 5 additions and 5 deletions
|
@ -50,7 +50,7 @@ ynh_use_ruby () {
|
||||||
[[ -n "${ruby_version:-}" ]] || ynh_die --message="\$ruby_version should be defined prior to calling ynh_use_ruby"
|
[[ -n "${ruby_version:-}" ]] || ynh_die --message="\$ruby_version should be defined prior to calling ynh_use_ruby"
|
||||||
|
|
||||||
# Get the absolute path of this version of Ruby
|
# Get the absolute path of this version of Ruby
|
||||||
ruby_path="$ruby_version_path/$YNH_APP_INSTANCE_NAME/bin"
|
ruby_path="$ruby_version_path/$app/bin"
|
||||||
|
|
||||||
# Allow alias to be used into bash script
|
# Allow alias to be used into bash script
|
||||||
shopt -s expand_aliases
|
shopt -s expand_aliases
|
||||||
|
@ -202,13 +202,13 @@ ynh_install_ruby () {
|
||||||
ruby_version=$final_ruby_version
|
ruby_version=$final_ruby_version
|
||||||
|
|
||||||
# Remove app virtualenv
|
# Remove app virtualenv
|
||||||
if rbenv alias --list | grep --quiet "$YNH_APP_INSTANCE_NAME "
|
if rbenv alias --list | grep --quiet "$app "
|
||||||
then
|
then
|
||||||
rbenv alias $YNH_APP_INSTANCE_NAME --remove
|
rbenv alias $app --remove
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create app virtualenv
|
# Create app virtualenv
|
||||||
rbenv alias $YNH_APP_INSTANCE_NAME $final_ruby_version
|
rbenv alias $app $final_ruby_version
|
||||||
|
|
||||||
# Cleanup Ruby versions
|
# Cleanup Ruby versions
|
||||||
ynh_cleanup_ruby
|
ynh_cleanup_ruby
|
||||||
|
@ -238,7 +238,7 @@ ynh_remove_ruby () {
|
||||||
# Remove /usr/local/bin in PATH in case of Ruby prior installation
|
# Remove /usr/local/bin in PATH in case of Ruby prior installation
|
||||||
PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
|
PATH=$(echo $CLEAR_PATH | sed 's@/usr/local/bin:@@')
|
||||||
|
|
||||||
rbenv alias $YNH_APP_INSTANCE_NAME --remove
|
rbenv alias $app --remove
|
||||||
|
|
||||||
# Remove the line for this app
|
# Remove the line for this app
|
||||||
ynh_app_setting_delete --key=ruby_version
|
ynh_app_setting_delete --key=ruby_version
|
||||||
|
|
Loading…
Add table
Reference in a new issue