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

[fix] Manage the upgrade from current official ynh package

Browse source
This commit is contained in:
Jérôme Lebleu 2016-03-30 16:01:05 +02:00
parent e081a7cbaf
commit 840149b88d
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -4,15 +4,10 @@ Roundcube for YunoHost
This is a work-in-progress package review to update Roundcube to 1.1.x This is a work-in-progress package review to update Roundcube to 1.1.x
and make use of new YunoHost facilities - e.g. app helpers. and make use of new YunoHost facilities - e.g. app helpers.
**Please note that upgrade from official app has not been fully tested
and so is not safe yet. Use this app at your own risk, but feel free to
report issues and/or improvements!**
## TODO ## TODO
* Ask for rcmcarddav installation and/or check if *Baikal* or *ownCloud* * Ask for rcmcarddav installation and/or check if *Baikal* or *ownCloud*
is installed is installed
* Test to upgrade from the current Roundcube version
* ... * ...
## Links ## ## Links ##

17
patches/00-installto-opts.patch
View file

@ -1,5 +1,5 @@
--- a/bin/installto.sh 2016-03-26 19:17:32.092002076 +0100 --- a/bin/installto.sh 2016-03-30 15:46:11.686447589 +0200
+++ b/bin/installto.sh 2016-03-26 19:26:37.787511189 +0100 +++ b/bin/installto.sh 2016-03-30 15:49:27.184064426 +0200
@@ -23,6 +23,9 @@ @@ -23,6 +23,9 @@
require_once INSTALL_PATH . 'program/include/clisetup.php'; require_once INSTALL_PATH . 'program/include/clisetup.php';
@ -30,3 +30,16 @@
$err = false; $err = false;
echo "Copying files to target location..."; echo "Copying files to target location...";
$dirs = array('program','installer','bin','SQL','plugins','skins'); $dirs = array('program','installer','bin','SQL','plugins','skins');
@@ -77,7 +82,11 @@
if (!$err) {
echo "Running update script at target...\n";
- system("cd $target_dir && php bin/update.sh --version=$oldversion");
+ $command = "cd $target_dir && php bin/update.sh --version=$oldversion";
+ if ($opts['accept']) {
+ $command .= " --accept";
+ }
+ system($command);
echo "All done.\n";
}
}

3
scripts/_common.sh
View file

@ -83,7 +83,8 @@ init_composer() {
# install composer # install composer
curl -sS https://getcomposer.org/installer \ curl -sS https://getcomposer.org/installer \
| exec_as "$AS_USER" php -- --quiet --install-dir="$DESTDIR" \ | exec_as "$AS_USER" COMPOSER_HOME="${DESTDIR}/.composer" \
php -- --quiet --install-dir="$DESTDIR" \
|| die "Unable to install Composer" || die "Unable to install Composer"
# install composer.json # install composer.json

2
scripts/upgrade
View file

@ -63,7 +63,7 @@ if [[ -f ${DESTDIR}/composer.json ]]; then
# TODO: update new Roundcube dependencies versions # TODO: update new Roundcube dependencies versions
exec_composer www-data "$DESTDIR" update --no-dev exec_composer www-data "$DESTDIR" update --no-dev
else else
init_composer "$DESTDIR" init_composer "$DESTDIR" www-data
fi fi
# Install some plugins manually # Install some plugins manually