bur
/
jjr-joplin
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix Joplin Terminal 

Locales files were being copied from the wrong source.
Fixes #2
main
Alfredo Palhares 2018-04-27 11:24:00 +01:00
parent 961188f51b
commit f4e3645791
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.SRCINFO
View File

@ -1,7 +1,7 @@
pkgbase = joplin pkgbase = joplin
pkgdesc = Joplin - a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS. pkgdesc = Joplin - a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS.
pkgver = 1.0.83 pkgver = 1.0.83
pkgrel = 4 pkgrel = 5
url = https://joplin.cozic.net url = https://joplin.cozic.net
arch = x86_64 arch = x86_64
arch = i686 arch = i686

20
PKGBUILD
View File

@ -5,7 +5,7 @@
pkgname=joplin pkgname=joplin
pkgver=1.0.83 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." pkgdesc="Joplin - a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS."
arch=("x86_64" "i686") arch=("x86_64" "i686")
makedepends=("git" "nodejs" "rsync" "npm") makedepends=("git" "nodejs" "rsync" "npm")
@ -14,7 +14,7 @@ provides=("joplin" "joplin-cli")
url="https://joplin.cozic.net" url="https://joplin.cozic.net"
license=("MIT") license=("MIT")
source=("${pkgname}.desktop" "joplin-desktop.sh" "joplin.sh" 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" sha256sums=("9ee4a831a0853ddbdc7279629d8f9238d3737b570898be16176ba0968b53d43d"
"5a3ace64906080adde5a5ea10ec9221fb2d94de770e6ee35b454aa30608b4097" "5a3ace64906080adde5a5ea10ec9221fb2d94de770e6ee35b454aa30608b4097"
"5e3424162814db56718b01740af1ef7c9b30e00f563040456eeb8b7eaca81427" "5e3424162814db56718b01740af1ef7c9b30e00f563040456eeb8b7eaca81427"
@ -31,17 +31,17 @@ build() {
rsync -a --exclude "node_modules/" "${srcdir}/${pkgname}-${pkgver}/CliClient/app/" \ rsync -a --exclude "node_modules/" "${srcdir}/${pkgname}-${pkgver}/CliClient/app/" \
"${srcdir}/${pkgname}-${pkgver}/CliClient/build" "${srcdir}/${pkgname}-${pkgver}/CliClient/build"
rsync -a --delete "${srcdir}/${pkgname}-${pkgver}/CliClient/locales" \ rsync -a --delete "${srcdir}/${pkgname}-${pkgver}/ReactNativeClient/locales" \
"${srcdir}/${pkgname}-${pkgver}/CliClient/build/" "${srcdir}/${pkgname}-${pkgver}/CliClient/build/"
rsync -a --delete "${srcdir}/${pkgname}-${pkgver}/ReactNativeClient/lib/" \ 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.json" "${srcdir}/${pkgname}-${pkgver}/CliClient/build"
cp "package-lock.json" "${srcdir}/${pkgname}-${pkgver}/CliClient/build" cp "package-lock.json" "${srcdir}/${pkgname}-${pkgver}/CliClient/build"
cd "${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" cd "${srcdir}/${pkgname}-${pkgver}/ElectronClient/app"
npm install npm install
@ -56,7 +56,7 @@ package() {
mkdir -p ${pkgdir}/usr/share/{${pkgname},${pkgname}-cli,applications,licenses/${pkgname}} mkdir -p ${pkgdir}/usr/share/{${pkgname},${pkgname}-cli,applications,licenses/${pkgname}}
cp -R "${srcdir}/${pkgname}-${pkgver}/CliClient/build/"* \ 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/"* \ cp -R "${srcdir}/${pkgname}-${pkgver}/ElectronClient/app/dist/linux-unpacked/"* \
"${pkgdir}/usr/share/${pkgname}" "${pkgdir}/usr/share/${pkgname}"
@ -66,6 +66,6 @@ package() {
install -m755 joplin.sh "${pkgdir}/usr/bin/joplin" install -m755 joplin.sh "${pkgdir}/usr/bin/joplin"
install -Dm644 ../joplin.desktop ${pkgdir}/usr/share/applications/joplin.desktop install -Dm644 ../joplin.desktop ${pkgdir}/usr/share/applications/joplin.desktop
install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \ install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
} }