summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlfredo Palhares2018-04-27 11:24:00 +0100
committerAlfredo Palhares2018-04-27 11:24:00 +0100
commitf4e3645791ad41ffc37ec7baafe7c7f370df9f30 (patch)
treeb2bb763ce109dd38b15c7e4b1a167e598704e2ff
parent961188f51b18f81a86a1eecef7125141bf332ca1 (diff)
downloadaur-f4e3645791ad41ffc37ec7baafe7c7f370df9f30.tar.gz
Fix Joplin Terminal
Locales files were being copied from the wrong source. Fixes #2
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD20
2 files changed, 11 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f43b97e712cc..6caf4970400a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = joplin
pkgdesc = Joplin - a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS.
pkgver = 1.0.83
- pkgrel = 4
+ pkgrel = 5
url = https://joplin.cozic.net
arch = x86_64
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index c48d5f743676..cac6139c6b3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=joplin
pkgver=1.0.83
-pkgrel=4
+pkgrel=5
pkgdesc="Joplin - a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS."
arch=("x86_64" "i686")
makedepends=("git" "nodejs" "rsync" "npm")
@@ -14,7 +14,7 @@ provides=("joplin" "joplin-cli")
url="https://joplin.cozic.net"
license=("MIT")
source=("${pkgname}.desktop" "joplin-desktop.sh" "joplin.sh"
- "https://github.com/laurent22/joplin/archive/v1.0.83.zip")
+ "https://github.com/laurent22/joplin/archive/v1.0.83.zip")
sha256sums=("9ee4a831a0853ddbdc7279629d8f9238d3737b570898be16176ba0968b53d43d"
"5a3ace64906080adde5a5ea10ec9221fb2d94de770e6ee35b454aa30608b4097"
"5e3424162814db56718b01740af1ef7c9b30e00f563040456eeb8b7eaca81427"
@@ -31,17 +31,17 @@ build() {
rsync -a --exclude "node_modules/" "${srcdir}/${pkgname}-${pkgver}/CliClient/app/" \
"${srcdir}/${pkgname}-${pkgver}/CliClient/build"
- rsync -a --delete "${srcdir}/${pkgname}-${pkgver}/CliClient/locales" \
- "${srcdir}/${pkgname}-${pkgver}/CliClient/build/"
+ rsync -a --delete "${srcdir}/${pkgname}-${pkgver}/ReactNativeClient/locales" \
+ "${srcdir}/${pkgname}-${pkgver}/CliClient/build/"
rsync -a --delete "${srcdir}/${pkgname}-${pkgver}/ReactNativeClient/lib/" \
- "${srcdir}/${pkgname}-${pkgver}/CliClient/build/lib"
+ "${srcdir}/${pkgname}-${pkgver}/CliClient/build/lib"
cp "package.json" "${srcdir}/${pkgname}-${pkgver}/CliClient/build"
cp "package-lock.json" "${srcdir}/${pkgname}-${pkgver}/CliClient/build"
cd "${srcdir}/${pkgname}-${pkgver}/CliClient/build/"
- npm install
+ npm install
- # Electron App
+ # Electron App
cd "${srcdir}/${pkgname}-${pkgver}/ElectronClient/app"
npm install
@@ -56,7 +56,7 @@ package() {
mkdir -p ${pkgdir}/usr/share/{${pkgname},${pkgname}-cli,applications,licenses/${pkgname}}
cp -R "${srcdir}/${pkgname}-${pkgver}/CliClient/build/"* \
- "${pkgdir}/usr/share/${pkgname}-cli"
+ "${pkgdir}/usr/share/${pkgname}-cli"
cp -R "${srcdir}/${pkgname}-${pkgver}/ElectronClient/app/dist/linux-unpacked/"* \
"${pkgdir}/usr/share/${pkgname}"
@@ -66,6 +66,6 @@ package() {
install -m755 joplin.sh "${pkgdir}/usr/bin/joplin"
install -Dm644 ../joplin.desktop ${pkgdir}/usr/share/applications/joplin.desktop
- install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \
- "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \
+ "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}