summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Freund2019-01-10 21:17:04 +0100
committerFlorian Freund2019-01-10 21:17:04 +0100
commit3cdad61f34779d3e9fe7cfa484566efeacacacec (patch)
tree6d00bd72c632c8407926e0b395d8dbc045296dfe
parent0b5ee9fb9ca327353967fe9d93bd754e2b78cdc4 (diff)
downloadaur-3cdad61f34779d3e9fe7cfa484566efeacacacec.tar.gz
Change default config path
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
-rw-r--r--xournalpp.install11
3 files changed, 19 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 351c80f8818b..7b05982d15cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xournalpp-git
pkgdesc = C++ re-write of tablet notetaking app Xournal
- pkgver = 1.0.5.23.g8bc03fff
+ pkgver = 1.0.6.macOS.alpha1.53.gfc887771
pkgrel = 1
url = https://github.com/xournalpp/xournalpp
install = xournalpp.install
diff --git a/PKGBUILD b/PKGBUILD
index 0581f972a492..5c47e91ef0e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
_pkgname="xournalpp"
pkgname="${_pkgname}-git"
-pkgver=1.0.5.23.g8bc03fff
+pkgver=1.0.6.macOS.alpha1.53.gfc887771
pkgrel=1
pkgdesc="C++ re-write of tablet notetaking app Xournal"
arch=('i686' 'x86_64')
@@ -32,7 +32,12 @@ prepare() {
test -e "${srcdir}/${_pkgname}/build" || mkdir -p "${srcdir}/${_pkgname}/build"
cd "${srcdir}/${_pkgname}/build"
- cmake -DENABLE_OS="OFF" -DENABLE_MATHTEX="ON" -DCMAKE_INSTALL_PREFIX="/usr/" ..
+ if [ -z "$XDG_CONFIG_HOME" ]; then
+ configdir=".config"
+ else
+ configdir="$XDG_CONFIG_HOME"
+ fi
+ cmake -DENABLE_MATHTEX="ON" -DCMAKE_INSTALL_PREFIX="/usr/" -DDEV_CONFIG_DIR="$configdir/xournalpp" ..
}
build() {
diff --git a/xournalpp.install b/xournalpp.install
index dfcb68374210..0fb20cad6369 100644
--- a/xournalpp.install
+++ b/xournalpp.install
@@ -6,6 +6,17 @@ post_install() {
post_upgrade() {
post_install
+
+ configs=$(find /home/ /root/ -maxdepth 2 -name ".xournalpp" 2> /dev/null)
+ if ! [ -z "$configs" ]; then
+ cat << EOF
+
+WARNING: Default config folder moved from \$HOME/.xournalpp to \$HOME/\$XDG_CONFIG_HOME/xournalpp (default .config)
+Found following config paths:
+EOF
+ echo "$configs"
+ echo
+ fi
}
post_remove() {