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

Merge remote-tracking branch 'origin/test' into test

Browse source 
Conflicts:
	scripts/upgrade
This commit is contained in:
scith 2015-10-24 23:52:00 +02:00
commit 0782c4c131
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/upgrade
View file

@ -19,8 +19,13 @@ app=rainloop
# the old version is not deleted... the new version is in a new path # the old version is not deleted... the new version is in a new path
# Use of latest community edition # Use of latest community edition
<<<<<<< HEAD
sudo unzip -q ../sources/rainloop-community.zip -d $rainloop_path/ sudo unzip -q ../sources/rainloop-community.zip -d $rainloop_path/
=======
sudo unzip ../sources/rainloop-community.zip -d $rainloop_path/
>>>>>>> origin/test
# Update patch to auto load version # Update patch to auto load version
sudo cp ../sources/patch/index_auto_version.php $rainloop_path/index.php sudo cp ../sources/patch/index_auto_version.php $rainloop_path/index.php
@ -63,4 +68,4 @@ app=rainloop
# Reload Nginx and regenerate SSOwat conf # Reload Nginx and regenerate SSOwat conf
sudo service php5-fpm reload sudo service php5-fpm reload
sudo service nginx reload sudo service nginx reload
sudo yunohost app ssowatconf sudo yunohost app ssowatconf