Bump version; Add optional fuse-overlayfs

4 files changed, 78 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6741730bb5bf..04c10565c9b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = notepadpp
-	pkgdesc = A free source code editor for Windows
-	pkgver = 7.6.6
+	pkgdesc = A free source code editor for Windows (32-bit)
+	pkgver = 7.8.4
 	pkgrel = 1
 	url = https://notepad-plus-plus.org/
 	arch = i686
@@ -9,28 +9,21 @@ pkgbase = notepadpp
 	makedepends = unzip
 	depends = wine
 	depends = sh
-	noextract = npp.7.6.6.bin.zip
-	noextract = npp.7.6.6.bin.x64.zip
+	noextract = npp.7.8.4.bin.zip
+	noextract = npp.7.8.4.bin.x64.zip
 	options = !strip
-	source = notepadpp
+	source = notepadpp-legacy
+	source = notepadpp-overlayfs
 	source = notepadpp.desktop
 	source = notepadpp.png
-	source = https://notepad-plus-plus.org/repository/7.x/7.6.6/npp.7.6.6.bin.zip
-	source = https://notepad-plus-plus.org/repository/7.x/7.6.6/npp.7.6.6.bin.x64.zip
+	source = https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v7.8.4/npp.7.8.4.bin.zip
+	source = https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v7.8.4/npp.7.8.4.bin.x64.zip
 	sha256sums = 849aebb1491c7243e5bb8069d57a69163ed1f47a71f033414a6794081b0e62ec
+	sha256sums = a104f9759db9b2ae95577f2576a5257ffaf4a6beef366d2e0de64d10b6d114ec
 	sha256sums = a1c34d444893d56ae165c8457260e11b729ea2afc10bb9e2690bc89e1f523238
 	sha256sums = 04c8ad254a41350078bba4d56ad54f7b4c0df125029aee021ea0ac632971ebad
-	sha256sums = de0812691154858382233c8957cb5d65c7db1e88430bed2383c3518c5d5c78ce
-	sha256sums = 92cf60d3ef54625ac32bb6ae7bc2889172bbd16cb5825ee14b1bffc1548291fe
-
-pkgname = notepadpp-win64
-	pkgdesc = A free source code editor for Windows (64-bit)
-	provides = notepadpp
-	conflicts = notepadpp
-	replaces = notepadpp
+	sha256sums = 198a476b32ea3b8dfcb21d4caa93d2c99c4c1399c2af40e5d27cc5a9cffb5924
+	sha256sums = 802b65fe2071fa2345c09fffc58a5ef0a4c05394c94138f8ecb41644bfebe448
 
-pkgname = notepadpp-win32
-	pkgdesc = A free source code editor for Windows (32-bit)
-	provides = notepadpp
-	conflicts = notepadpp
+pkgname = notepadpp
 
diff --git a/PKGBUILD b/PKGBUILD
index 10f43a83451b..af65b6b4bf82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,57 @@
 # Maintainer: Renato Molnar <m dot renato93 at gmail dot com>
 
-pkgbase=notepadpp
-pkgname=("notepadpp-win64" "notepadpp-win32")
-pkgver=7.6.6
+_type=legacy
+#_type=overlayfs
+#_arch=x64
+
+
+pkgname=notepadpp
+_pkgname=notepad-plus-plus
+pkgver=7.8.4
 pkgrel=1
 pkgdesc="A free source code editor for Windows"
 arch=('x86_64')
-url="https://notepad-plus-plus.org/"
+url="https://${_pkgname}.org/"
 license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('wine' 'sh')
 makedepends=('unzip')
-source=(notepadpp
+source=(notepadpp-legacy
+        notepadpp-overlayfs
         notepadpp.desktop
         notepadpp.png
-        "https://notepad-plus-plus.org/repository/${pkgver%%.*}.x/${pkgver}/npp.${pkgver}.bin.zip"
-        "https://notepad-plus-plus.org/repository/${pkgver%%.*}.x/${pkgver}/npp.${pkgver}.bin.x64.zip")
-
-noextract=("npp.${pkgver}.bin.zip"
-           "npp.${pkgver}.bin.x64.zip")
+        "https://github.com/${_pkgname}/${_pkgname}/releases/download/v${pkgver}/npp.${pkgver}.bin.zip"
+        "https://github.com/${_pkgname}/${_pkgname}/releases/download/v${pkgver}/npp.${pkgver}.bin.x64.zip")
 
 sha256sums=('849aebb1491c7243e5bb8069d57a69163ed1f47a71f033414a6794081b0e62ec'
+            'a104f9759db9b2ae95577f2576a5257ffaf4a6beef366d2e0de64d10b6d114ec'
             'a1c34d444893d56ae165c8457260e11b729ea2afc10bb9e2690bc89e1f523238'
             '04c8ad254a41350078bba4d56ad54f7b4c0df125029aee021ea0ac632971ebad'
-            'de0812691154858382233c8957cb5d65c7db1e88430bed2383c3518c5d5c78ce'
-            '92cf60d3ef54625ac32bb6ae7bc2889172bbd16cb5825ee14b1bffc1548291fe')
-
-options=('!strip')
-
-package_notepadpp-win64() {
-    pkgdesc+=" (64-bit)"
-    conflicts=("notepadpp")
-    provides=("notepadpp")
-    replaces=("notepadpp")
-
-    install -d -m755 "${pkgdir}/usr/share/${pkgbase}"
-
-    unzip "npp.${pkgver}.bin.x64.zip" -d "${pkgdir}/usr/share/${pkgbase}"
+            '198a476b32ea3b8dfcb21d4caa93d2c99c4c1399c2af40e5d27cc5a9cffb5924'
+            '802b65fe2071fa2345c09fffc58a5ef0a4c05394c94138f8ecb41644bfebe448')
 
-    rm -rf "${pkgdir}/usr/share/${pkgbase}/updater" \
-           "${pkgdir}/usr/share/${pkgbase}/license.txt" \
+noextract=("npp.${pkgver}.bin.zip"
+           "npp.${pkgver}.bin.x64.zip")
 
-    find "${pkgdir}/usr/share/${pkgbase}" -type d -exec chmod 755 "{}" \;
-    find "${pkgdir}/usr/share/${pkgbase}" -type f -exec chmod 644 "{}" \;
+if [[ "${_type}" == 'overlayfs' ]]; then
+    depends+=('fuse-overlayfs')
+fi
 
-    sed -i 's/sedversion/"${pkgver}-${pkgrel}"/' notepadpp
+if [[ "${_arch}" == x64 ]]; then
+    _arch='.x64'
+    pkgdesc+=" (64-bit)"
+else
+    _arch=''
+    pkgdesc+=" (32-bit)"
+fi
 
-    install -D -m755 notepadpp "${pkgdir}/usr/bin/notepadpp"
-    install -D -m644 notepadpp.png "${pkgdir}/usr/share/pixmaps/notepadpp.png"
-    install -D -m644 notepadpp.desktop "${pkgdir}/usr/share/applications/notepadpp.desktop"
-}
+options=('!strip')
 
-package_notepadpp-win32() {
-    pkgdesc+=" (32-bit)"
-    conflicts=("notepadpp")
-    provides=("notepadpp")
+package() {
 
     install -d -m755 "${pkgdir}/usr/share/${pkgbase}"
 
-    unzip "npp.${pkgver}.bin.zip" -d "${pkgdir}/usr/share/${pkgbase}"
+    unzip "${srcdir}/npp.${pkgver}.bin${_arch}.zip" -d "${pkgdir}/usr/share/${pkgbase}"
 
     rm -rf "${pkgdir}/usr/share/${pkgbase}/updater" \
            "${pkgdir}/usr/share/${pkgbase}/license.txt" \
@@ -66,9 +59,10 @@ package_notepadpp-win32() {
     find "${pkgdir}/usr/share/${pkgbase}" -type d -exec chmod 755 "{}" \;
     find "${pkgdir}/usr/share/${pkgbase}" -type f -exec chmod 644 "{}" \;
 
-    sed -i "s/SED_APPVER/${pkgver}-${pkgrel}/" notepadpp
+    sed -i "s|SED_APPVER|${pkgver}-${pkgrel}|" "${srcdir}/notepadpp-legacy"
 
-    install -D -m755 notepadpp "${pkgdir}/usr/bin/notepadpp"
-    install -D -m644 notepadpp.png "${pkgdir}/usr/share/pixmaps/notepadpp.png"
-    install -D -m644 notepadpp.desktop "${pkgdir}/usr/share/applications/notepadpp.desktop"
+    install -D -m755 "${srcdir}/notepadpp-${_type}" "${pkgdir}/usr/bin/notepadpp"
+    install -D -m644 "${srcdir}/notepadpp.png" "${pkgdir}/usr/share/pixmaps/notepadpp.png"
+    install -D -m644 "${srcdir}/notepadpp.desktop" "${pkgdir}/usr/share/applications/notepadpp.desktop"
 }
+
diff --git a/notepadpp b/notepadpp-legacy
index 35d53c86d949..35d53c86d949 100644
--- a/notepadpp
+++ b/notepadpp-legacy
diff --git a/notepadpp-overlayfs b/notepadpp-overlayfs
new file mode 100644
index 000000000000..723c5e9b8147
--- /dev/null
+++ b/notepadpp-overlayfs
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+app_name='notepadpp'
+
+pkgdir="/usr/share/${app_name}"
+localdir="${HOME}/.local/share/${app_name}"
+configdir="${HOME}/.config/${app_name}"
+cachedir="${HOME}/.cache/${app_name}"
+
+unset WINEPREFIX
+
+for folder in "${localdir}" "${cachedir}" "${configdir}"; do
+    if [ ! -d "${folder}" ]; then
+        mkdir -p "${folder}"
+    fi
+done
+
+if mount | grep -q "${localdir}"; then
+    echo "${app_name} already mounted"
+elif ! fuse-overlayfs -o lowerdir="${pkgdir}" -o upperdir="${configdir}" -o workdir="${cachedir}" "${localdir}"; then
+    echo "ERROR: cannot mount fuse-overlayfs for ${app_name}"
+    exit 1
+fi
+
+if [ -n "${1}" ]; then
+    argpath="Z:\\$(readlink -f "${1}" | sed 's|/|\\\\|g')"
+fi
+
+WINEDEBUG=-all exec wine "${localdir}/${app_name}" "${args}${argpath}"
+