YunoHost-Apps/discourse_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/discourse_ynh.git synced 2024-09-03 18:26:18 +02:00
Code Issues Activity Actions

Update _common.sh

Browse source
This commit is contained in:
ericgaspar 2021-06-03 20:21:07 +02:00
parent 12e22fb413
commit 99f528c777
No known key found for this signature in database
GPG key ID: 574F281483054D44
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scripts/_common.sh
View file

@ -270,11 +270,11 @@ ynh_install_ruby () {
ynh_print_info --message="rbenv already seems installed in \`$rbenv'." ynh_print_info --message="rbenv already seems installed in \`$rbenv'."
pushd "${rbenv%/*/*}" pushd "${rbenv%/*/*}"
if git remote -v 2>/dev/null | grep "https://github.com/rbenv/rbenv.git"; then if git remote -v 2>/dev/null | grep "https://github.com/rbenv/rbenv.git"; then
ynh_print_info --message="Trying to update with git..." ynh_print_info --message="Trying to update with Git..."
git pull -q --tags origin master git pull -q --tags origin master
ynh_ruby_try_bash_extension ynh_ruby_try_bash_extension
else else
ynh_print_info --message="Reinstalling rbenv with git..." ynh_print_info --message="Reinstalling rbenv with Git..."
cd .. cd ..
ynh_secure_remove --file=$rbenv_install_dir ynh_secure_remove --file=$rbenv_install_dir
mkdir -p $rbenv_install_dir mkdir -p $rbenv_install_dir
@ -287,7 +287,7 @@ ynh_install_ruby () {
fi fi
popd popd
else else
ynh_print_info --message="Installing rbenv with git..." ynh_print_info --message="Installing rbenv with Git..."
mkdir -p $rbenv_install_dir mkdir -p $rbenv_install_dir
pushd $rbenv_install_dir pushd $rbenv_install_dir
git init -q git init -q
@ -308,7 +308,7 @@ ynh_install_ruby () {
fi fi
popd popd
else else
ynh_print_info --message="Installing ruby-build with git..." ynh_print_info --message="Installing ruby-build with Git..."
mkdir -p "${rbenv_install_dir}/plugins" mkdir -p "${rbenv_install_dir}/plugins"
git clone -q https://github.com/rbenv/ruby-build.git "${rbenv_install_dir}/plugins/ruby-build" git clone -q https://github.com/rbenv/ruby-build.git "${rbenv_install_dir}/plugins/ruby-build"
fi fi
@ -323,7 +323,7 @@ ynh_install_ruby () {
fi fi
popd popd
else else
ynh_print_info --message="Installing rbenv-aliases with git..." ynh_print_info --message="Installing rbenv-aliases with Git..."
mkdir -p "${rbenv_install_dir}/plugins" mkdir -p "${rbenv_install_dir}/plugins"
git clone -q https://github.com/tpope/rbenv-aliases.git "${rbenv_install_dir}/plugins/rbenv-aliase" git clone -q https://github.com/tpope/rbenv-aliases.git "${rbenv_install_dir}/plugins/rbenv-aliase"
fi fi
@ -338,7 +338,7 @@ ynh_install_ruby () {
fi fi
popd popd
else else
ynh_print_info --message="Installing xxenv-latest with git..." ynh_print_info --message="Installing xxenv-latest with Git..."
mkdir -p "${rbenv_install_dir}/plugins" mkdir -p "${rbenv_install_dir}/plugins"
git clone -q https://github.com/momo-lab/xxenv-latest.git "${rbenv_install_dir}/plugins/xxenv-latest" git clone -q https://github.com/momo-lab/xxenv-latest.git "${rbenv_install_dir}/plugins/xxenv-latest"
fi fi
@ -380,10 +380,10 @@ ynh_install_ruby () {
# Set environment for Ruby users # Set environment for Ruby users
echo "#rbenv echo "#rbenv
export RBENV_ROOT=$rbenv_install_dir export RBENV_ROOT=$rbenv_install_dir
export PATH=\"$rbenv_install_dir/bin:$PATH\" export PATH=\"$rbenv_install_dir/bin:$PATH\"
eval \"\$(rbenv init -)\" eval \"\$(rbenv init -)\"
#rbenv" > /etc/profile.d/rbenv.sh #rbenv" > /etc/profile.d/rbenv.sh
# Load the environment # Load the environment
eval "$(rbenv init -)" eval "$(rbenv init -)"