Bump version. Remove legacy start script

4 files changed, 22 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4271fd2a93b3..a2bd478ecda2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = notepadpp
 	pkgdesc = A free source code editor for Windows (32-bit)
-	pkgver = 7.8.4
-	pkgrel = 2
+	pkgver = 7.9
+	pkgrel = 1
 	url = https://notepad-plus-plus.org/
 	arch = i686
 	arch = x86_64
@@ -9,24 +9,23 @@ pkgbase = notepadpp
 	makedepends = unzip
 	depends = wine
 	depends = sh
+	depends = fuse-overlayfs
 	provides = notepadpp
 	conflicts = notepadpp-win32
 	conflicts = notepadpp-win64
-	noextract = npp.7.8.4.bin.zip
-	noextract = npp.7.8.4.bin.x64.zip
+	noextract = npp.7.9.bin.zip
+	noextract = npp.7.9.bin.x64.zip
 	options = !strip
-	source = notepadpp-legacy
-	source = notepadpp-overlayfs
+	source = notepadpp
 	source = notepadpp.desktop
 	source = notepadpp.png
-	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
+	source = https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v7.9/npp.7.9.portable.zip
+	source = https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v7.9/npp.7.9.portable.x64.zip
 	sha256sums = a104f9759db9b2ae95577f2576a5257ffaf4a6beef366d2e0de64d10b6d114ec
 	sha256sums = a1c34d444893d56ae165c8457260e11b729ea2afc10bb9e2690bc89e1f523238
 	sha256sums = 04c8ad254a41350078bba4d56ad54f7b4c0df125029aee021ea0ac632971ebad
-	sha256sums = 198a476b32ea3b8dfcb21d4caa93d2c99c4c1399c2af40e5d27cc5a9cffb5924
-	sha256sums = 802b65fe2071fa2345c09fffc58a5ef0a4c05394c94138f8ecb41644bfebe448
+	sha256sums = 22dd3d1d30b4a75717207206d568ff0654430ccb6fa18c3faeb94692a7020e2a
+	sha256sums = 126b4cdab094639696ffa92f2e544b8ba8487333175e1b729ba1a2682406f65a
 
 pkgname = notepadpp
 
diff --git a/PKGBUILD b/PKGBUILD
index 3e2486eba4a7..e00d8d409611 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,35 @@
 # Maintainer: Renato Molnar <m dot renato93 at gmail dot com>
 
-_type=legacy
-#_type=overlayfs
 #_arch=x64
 
-
 pkgname=notepadpp
 _pkgname=notepad-plus-plus
-pkgver=7.8.4
-pkgrel=2
+pkgver=7.9
+pkgrel=1
 pkgdesc="A free source code editor for Windows"
 arch=('x86_64')
 url="https://${_pkgname}.org/"
 license=('GPL2')
 arch=('i686' 'x86_64')
-depends=('wine' 'sh')
+depends=('wine' 'sh' 'fuse-overlayfs')
 makedepends=('unzip')
 provides=(notepadpp)
 conflicts=('notepadpp-win32' 'notepadpp-win64')
-source=(notepadpp-legacy
-        notepadpp-overlayfs
+source=(notepadpp
         notepadpp.desktop
         notepadpp.png
-        "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")
+        "https://github.com/${_pkgname}/${_pkgname}/releases/download/v${pkgver}/npp.${pkgver}.portable.zip"
+        "https://github.com/${_pkgname}/${_pkgname}/releases/download/v${pkgver}/npp.${pkgver}.portable.x64.zip")
 
-sha256sums=('849aebb1491c7243e5bb8069d57a69163ed1f47a71f033414a6794081b0e62ec'
-            'a104f9759db9b2ae95577f2576a5257ffaf4a6beef366d2e0de64d10b6d114ec'
+sha256sums=('a104f9759db9b2ae95577f2576a5257ffaf4a6beef366d2e0de64d10b6d114ec'
             'a1c34d444893d56ae165c8457260e11b729ea2afc10bb9e2690bc89e1f523238'
             '04c8ad254a41350078bba4d56ad54f7b4c0df125029aee021ea0ac632971ebad'
-            '198a476b32ea3b8dfcb21d4caa93d2c99c4c1399c2af40e5d27cc5a9cffb5924'
-            '802b65fe2071fa2345c09fffc58a5ef0a4c05394c94138f8ecb41644bfebe448')
+            '22dd3d1d30b4a75717207206d568ff0654430ccb6fa18c3faeb94692a7020e2a'
+            '126b4cdab094639696ffa92f2e544b8ba8487333175e1b729ba1a2682406f65a')
 
 noextract=("npp.${pkgver}.bin.zip"
            "npp.${pkgver}.bin.x64.zip")
 
-if [[ "${_type}" == 'overlayfs' ]]; then
-    depends+=('fuse-overlayfs')
-fi
-
 if [[ "${_arch}" == x64 ]]; then
     _arch='.x64'
     pkgdesc+=" (64-bit)"
@@ -53,7 +44,7 @@ package() {
 
     install -d -m755 "${pkgdir}/usr/share/${pkgbase}"
 
-    unzip "${srcdir}/npp.${pkgver}.bin${_arch}.zip" -d "${pkgdir}/usr/share/${pkgbase}"
+    unzip "${srcdir}/npp.${pkgver}.portable${_arch}.zip" -d "${pkgdir}/usr/share/${pkgbase}"
 
     rm -rf "${pkgdir}/usr/share/${pkgbase}/updater" \
            "${pkgdir}/usr/share/${pkgbase}/license.txt" \
@@ -61,9 +52,9 @@ package() {
     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}|" "${srcdir}/notepadpp-legacy"
+    ln -s "/usr/share/${pkgbase}/notepad++.exe" "${pkgdir}/usr/share/${pkgbase}/notepadpp.exe"
 
-    install -D -m755 "${srcdir}/notepadpp-${_type}" "${pkgdir}/usr/bin/notepadpp"
+    install -D -m755 "${srcdir}/notepadpp" "${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-overlayfs b/notepadpp
index 723c5e9b8147..723c5e9b8147 100644
--- a/notepadpp-overlayfs
+++ b/notepadpp
diff --git a/notepadpp-legacy b/notepadpp-legacy
deleted file mode 100644
index 35d53c86d949..000000000000
--- a/notepadpp-legacy
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env sh
-
-app_name='notepadpp'
-app_ver='SED_APPVER'
-
-pkgdir="/usr/share/${app_name}"
-localdir="${HOME}/.local/share/${app_name}"
-verfile="${localdir}/${app_name}.ver"
-
-unset WINEPREFIX
-
-if [ ! "${verfile}" ]; then
-    mkdir -p "${localdir}"
-    touch "${verfile}"
-fi
-
-if [ ! "$(cat "${verfile}")" = "${app_ver}" ]; then
-    # Delete broken symlinks and empty dirs
-    find "${localdir}" -xtype l -delete
-    find "${localdir}" -type d -empty -delete
-
-    # Copy if file does not exists
-    [ -e "${localdir}/contextMenu.xml" ] || 
-        cp "${pkgdir}/contextMenu.xml"   "${localdir}/contextMenu.xml"
-
-    [ -e "${localdir}/doLocalConf.xml" ] || 
-        cp "${pkgdir}/doLocalConf.xml"   "${localdir}/doLocalConf.xml"
-
-    [ -e "${localdir}/functionList.xml" ] || 
-        cp "${pkgdir}/functionList.xml"  "${localdir}/functionList.xml"
-
-    [ -e "${localdir}/langs.model.xml" ] || 
-        cp "${pkgdir}/langs.model.xml"   "${localdir}/langs.model.xml"
-
-    [ -e "${localdir}/shortcuts.xml" ] || 
-        cp "${pkgdir}/shortcuts.xml"     "${localdir}/shortcuts.xml"
-
-    [ -e "${localdir}/stylers.model.xml" ] || 
-        cp "${pkgdir}/stylers.model.xml" "${localdir}/stylers.model.xml"
-
-    ln -s "${pkgdir}/notepad++.exe" "${localdir}/notepadpp"
-    ln -s "${pkgdir}/SciLexer.dll"  "${localdir}/SciLexer.dll"
-    ln -s "${pkgdir}/change.log"    "${localdir}/change.log"
-    ln -s "${pkgdir}/readme.txt"    "${localdir}/readme.txt"
-
-    cp -rs "${pkgdir}/autoCompletion"  "${localdir}"
-    cp -rs "${pkgdir}/localization"    "${localdir}"
-    cp -rs "${pkgdir}/plugins"         "${localdir}"
-    cp -rs "${pkgdir}/themes"          "${localdir}"
-    cp -rs "${pkgdir}/userDefineLangs" "${localdir}"
-
-    echo "${app_ver}" > "${verfile}"
-fi
-
-WINEDEBUG=-all wine "${localdir}/${app_name}" "$@"