diff --git a/scripts/_common.sh b/scripts/_common.sh index f9452d0..0239616 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -22,27 +22,6 @@ COMMIT="bc855b0a1722d2f4ac534ea4d4035299acb7a40a" # PERSONAL HELPERS #================================================= -# Execute a command as another user with login -# (hence in user home dir, with prior loading of .profile, etc.) -# usage: exec_login_as USER COMMAND [ARG ...] -exec_login_as() { - local user=$1 - shift 1 - exec_as $user --login "$@" -} -# Execute a command as another user -# usage: exec_as USER COMMAND [ARG ...] -exec_as() { - local user=$1 - shift 1 - - if [[ $user = $(whoami) ]]; then - eval "$@" - else - sudo -u "$user" "$@" - fi -} - #================================================ # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index b99d10b..c139385 100644 --- a/scripts/install +++ b/scripts/install @@ -144,12 +144,12 @@ chown -R $app: "$final_path" pushd "$final_path/live" ynh_use_nodejs - exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle' - exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development' - exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet - exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile - exec_as $app env PATH=$ynh_node_load_PATH yarn bundle - exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet + ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle' + ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development' + ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet + ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile + ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn bundle + ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d865249..41e3409 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -173,12 +173,12 @@ then pushd "$final_path/live" ynh_use_nodejs - exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle' - exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development' - exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet - exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile - exec_as $app env PATH=$ynh_node_load_PATH yarn bundle - exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet + ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set --local path 'vendor/bundle' + ynh_exec_as $app $ynh_ruby_load_path bin/bundle config set with 'development' + ynh_exec_as $app $ynh_ruby_load_path bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --quiet + ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn install --pure-lockfile + ynh_exec_as $app env PATH=$ynh_node_load_PATH yarn bundle + ynh_exec_as $app $ynh_ruby_load_path bin/bundle exec rails assets:precompile --quiet popd fi