location of config changed

3 files changed, 14 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa64b076f559..c18ad981cc03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = languagetool-ngrams-de
 	pkgdesc = Finding errors using n-gram data, german text
 	pkgver = 20150819
-	pkgrel = 1
+	pkgrel = 2
 	url = http://wiki.languagetool.org/finding-errors-using-n-gram-data
 	install = languagetool-ngrams-de.install
 	arch = any
 	license = CCPL
 	optdepends = languagetool: system wide installation of LT
 	optdepends = libreoffice-extension-languagetool: standalone LT for LibreOffice
-	optdepends = openoffice-extension-languagetool: standalone LT for OpenOffice
 	options = !strip
 	source = languagetool-ngrams-de-20150819.zip::https://languagetool.org/download/ngram-data/ngrams-de-20150819.zip
 	md5sums = f9c8bbd525198fdf8005eed763ceda25
 
 pkgname = languagetool-ngrams-de
-
diff --git a/PKGBUILD b/PKGBUILD
index 25cfcdbb74a4..167e70f1be27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,13 @@
 
 pkgname=languagetool-ngrams-de
 pkgver=20150819
-pkgrel=1
+pkgrel=2
 pkgdesc="Finding errors using n-gram data, german text"
 arch=('any')
 url="http://wiki.languagetool.org/finding-errors-using-n-gram-data"
 license=('CCPL')
 optdepends=('languagetool: system wide installation of LT'
-'libreoffice-extension-languagetool: standalone LT for LibreOffice'
-'openoffice-extension-languagetool: standalone LT for OpenOffice')
+'libreoffice-extension-languagetool: standalone LT for LibreOffice')
 install=${pkgname}.install
 source=(${pkgname}-${pkgver}.zip::"https://languagetool.org/download/ngram-data/ngrams-de-${pkgver}.zip")
 md5sums=('f9c8bbd525198fdf8005eed763ceda25')
diff --git a/languagetool-ngrams-de.install b/languagetool-ngrams-de.install
index a01b606e2081..9fc21368e050 100644
--- a/languagetool-ngrams-de.install
+++ b/languagetool-ngrams-de.install
@@ -3,7 +3,7 @@ post_install() {
   # in two configuration files in every users home directory and the skeleton directory.
 
   _CONFIGLT=".languagetool.cfg"
-  _CONFIGOO=".languagetool-ooo.cfg"
+  _CONFIGOO=".config/LanguageTool/LibreOffice/Languagetool.cfg"
   _KEY="ngramDir"
   _VALUE="/usr/share/ngrams"
 
@@ -38,8 +38,11 @@ post_install() {
         _update_file "$USERDIR" "$_CONFIGOO"
       else
         # create symbolic link to the 1st if it doesn't.
-        (ln -s "$_CONFIGLT" "$USERDIR/$_CONFIGOO")
+        (install -d $(dirname "$USERDIR/$_CONFIGOO"))
+        (ln -s "$USERDIR/$_CONFIGLT" "$USERDIR/$_CONFIGOO")
         printf "    \e[95mLink created\e[0m\t| $USERDIR/$_CONFIGOO\n"
+        # Fix the ownership of possibly created directories.
+        (chown --recursive --reference="$USERDIR" "$USERDIR/.config/")
       fi
     fi
   done
@@ -49,7 +52,12 @@ post_install() {
   if [ -e "/etc/skel/$_CONFIGOO" ]; then
     _update_file "/etc/skel" "$_CONFIGOO"
   else
-    (ln -s "$_CONFIGLT" "/etc/skel/$_CONFIGOO")
+    (install -d $(dirname "/etc/skel/$_CONFIGOO"))
+    (ln -s "../../../$_CONFIGLT" "/etc/skel/$_CONFIGOO")
     printf "    \e[95mLink created\e[0m\t| /etc/skel/$_CONFIGOO\n"
   fi
 }
+
+post_upgrade() {
+  post_install
+}
\ No newline at end of file