Merge pull request #58 from YunoHost/global-upgrade-of-yunohost-admin

Global upgrade of yunohost-admin
This commit is contained in:
Alexandre Aubin 2020-06-04 19:17:47 +02:00 committed by GitHub
commit 34ab555ca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -165,7 +165,6 @@ function attach_ynhdev()
# './ynh-dev use-git yunohost-admin' # './ynh-dev use-git yunohost-admin'
if [[ ! -L ./yunohost-admin/src/dist ]] if [[ ! -L ./yunohost-admin/src/dist ]]
then then
ln -s /var/cache/ynh-dev/yunohost-admin/bower_components ./yunohost-admin/src/
ln -s /var/cache/ynh-dev/yunohost-admin/node_modules ./yunohost-admin/src/ ln -s /var/cache/ynh-dev/yunohost-admin/node_modules ./yunohost-admin/src/
ln -s /var/cache/ynh-dev/yunohost-admin/dist ./yunohost-admin/src/ ln -s /var/cache/ynh-dev/yunohost-admin/dist ./yunohost-admin/src/
fi fi
@ -287,7 +286,7 @@ function use_git()
then then
info "Installing dependencies to develop in yunohost-admin ..." info "Installing dependencies to develop in yunohost-admin ..."
curl -sL https://deb.nodesource.com/setup_6.x | bash - curl -sL https://deb.nodesource.com/setup_10.x | bash -
apt install nodejs -y apt install nodejs -y
npm install -g bower npm install -g bower
@ -296,9 +295,6 @@ function use_git()
cd /ynh-dev/yunohost-admin/src cd /ynh-dev/yunohost-admin/src
npm install --no-bin-links npm install --no-bin-links
su ynhdev -c "bower install"
su ynhdev -c "gulp build --dev"
create_sym_link "/ynh-dev/yunohost-admin/src" "/usr/share/yunohost/admin" create_sym_link "/ynh-dev/yunohost-admin/src" "/usr/share/yunohost/admin"
success "Now using Git repository for yunohost-admin" success "Now using Git repository for yunohost-admin"
@ -310,7 +306,7 @@ function use_git()
warn "don't need to re-run npm yourself everytime you change " warn "don't need to re-run npm yourself everytime you change "
warn "something ! " warn "something ! "
warn "-------------------------------------------------------- " warn "-------------------------------------------------------- "
su ynhdev -c "gulp watch --dev" su ynhdev -c "gulp --dev"
;; ;;
esac esac