diff options
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | agendav.install | 26 |
3 files changed, 16 insertions, 18 deletions
@@ -10,9 +10,6 @@ pkgbase = agendav backup = etc/webapps/agendav/config.php backup = etc/webapps/agendav/caldav.php backup = etc/webapps/agendav/database.php - backup = usr/share/webapps/agendav/web/config/config.php - backup = usr/share/webapps/agendav/web/config/caldav.php - backup = usr/share/webapps/agendav/web/config/database.php source = agendav-1.2.6.2.tar.gz::https://github.com/adobo/agendav/archive/1.2.6.2.tar.gz source = nginx.example.conf source = apache.example.conf @@ -15,10 +15,7 @@ depends=('php') # those file up every time... backup=("etc/webapps/agendav/config.php" "etc/webapps/agendav/caldav.php" - "etc/webapps/agendav/database.php" - "usr/share/webapps/agendav/web/config/config.php" - "usr/share/webapps/agendav/web/config/caldav.php" - "usr/share/webapps/agendav/web/config/database.php") + "etc/webapps/agendav/database.php") source=($pkgname-$pkgver.tar.gz::https://github.com/adobo/${pkgname}/archive/${pkgver}.tar.gz nginx.example.conf apache.example.conf) diff --git a/agendav.install b/agendav.install index a06e289f26ca..051af4e228c0 100644 --- a/agendav.install +++ b/agendav.install @@ -2,15 +2,19 @@ post_install() { echo "Check http://wiki.archlinux.org/index.php/AgenDAV for details." } -post_upgrade() { - echo "Since pkgrel -3, the incorrect symlinking of config files in this " - echo "package has been fixed. This however means pacman will install " - echo "the correct files as /etc/webapps/agendav/*.php.pacnew and leave a " - echo "broken symlink as *.php. This means AgenDAV will report no config " - echo "has been found." - echo - echo "Your existing config files should have been backed up in " - echo "/usr/share/webapps/agendav/config/web/*.php.pacbak. This means you " - echo "can probably fix things up by running this now:" - echo "FIXME" +pre_upgrade() { + ## Fix mess caused by the old package which had the symlinks the wrong way + ## around, so the user's config doesn't get lost... + for f in config.php caldav.php database.php; do + if [[ -h "/etc/webapps/agendav/$f" ]]; then + echo + echo "==> Fixing broken $f symlink from old package..." + # remove symlink first + echo "rm /etc/webapps/agendav/$f" + rm "/etc/webapps/agendav/$f" + # now move the real file (with the user's config) to /etc + echo "mv /usr/share/webapps/agendav/web/config/$f /etc/webapps/agendav" + mv "/usr/share/webapps/agendav/web/config/$f" /etc/webapps/agendav + fi + done } |