Bump version to 7.6.6; Redesign of launchscript

3 files changed, 90 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4582f3d84a7..6741730bb5bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,36 @@
 pkgbase = notepadpp
-	pkgdesc = A free source code editor for windows
-	pkgver = 7.6.1
+	pkgdesc = A free source code editor for Windows
+	pkgver = 7.6.6
 	pkgrel = 1
 	url = https://notepad-plus-plus.org/
+	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = unzip
 	depends = wine
 	depends = sh
-	noextract = npp.7.6.1.bin.zip
-	noextract = npp.7.6.1.bin.x64.zip
+	noextract = npp.7.6.6.bin.zip
+	noextract = npp.7.6.6.bin.x64.zip
 	options = !strip
 	source = notepadpp
 	source = notepadpp.desktop
 	source = notepadpp.png
-	source = https://notepad-plus-plus.org/repository/7.x/7.6.1/npp.7.6.1.bin.zip
-	source = https://notepad-plus-plus.org/repository/7.x/7.6.1/npp.7.6.1.bin.x64.zip
-	sha256sums = 23c83aa671be37dae7ea773a5cb43727ed22b985c763069fb3b6747cf2242434
+	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
+	sha256sums = 849aebb1491c7243e5bb8069d57a69163ed1f47a71f033414a6794081b0e62ec
 	sha256sums = a1c34d444893d56ae165c8457260e11b729ea2afc10bb9e2690bc89e1f523238
 	sha256sums = 04c8ad254a41350078bba4d56ad54f7b4c0df125029aee021ea0ac632971ebad
-	sha256sums = 3967f405ebeebd6ebf2c929958d7cc382c3375f4f3189f866af76d3148a95404
-	sha256sums = 7dda3fcc1a6e7ccdf61b938b64a185011a1b61e40293d7efe8defc0173f15c57
+	sha256sums = de0812691154858382233c8957cb5d65c7db1e88430bed2383c3518c5d5c78ce
+	sha256sums = 92cf60d3ef54625ac32bb6ae7bc2889172bbd16cb5825ee14b1bffc1548291fe
 
-pkgname = notepadpp
-	pkgdesc = A free source code editor for windows (64-bit)
-	arch = x86_64
+pkgname = notepadpp-win64
+	pkgdesc = A free source code editor for Windows (64-bit)
 	provides = notepadpp
-	conflicts = notepadpp-win32
+	conflicts = notepadpp
+	replaces = notepadpp
 
 pkgname = notepadpp-win32
-	pkgdesc = A free source code editor for windows (32-bit)
-	arch = x86_64
+	pkgdesc = A free source code editor for Windows (32-bit)
 	provides = notepadpp
 	conflicts = notepadpp
 
diff --git a/PKGBUILD b/PKGBUILD
index b576aa62cb41..10f43a83451b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Renato Molnar <m dot renato93 at gmail dot com>
 
 pkgbase=notepadpp
-pkgname=("notepadpp" "notepadpp-win32")
-pkgver=7.6.1
+pkgname=("notepadpp-win64" "notepadpp-win32")
+pkgver=7.6.6
 pkgrel=1
-pkgdesc="A free source code editor for windows"
+pkgdesc="A free source code editor for Windows"
 arch=('x86_64')
 url="https://notepad-plus-plus.org/"
 license=('GPL2')
+arch=('i686' 'x86_64')
 depends=('wine' 'sh')
 makedepends=('unzip')
 source=(notepadpp
@@ -19,56 +20,55 @@ source=(notepadpp
 noextract=("npp.${pkgver}.bin.zip"
            "npp.${pkgver}.bin.x64.zip")
 
-sha256sums=('23c83aa671be37dae7ea773a5cb43727ed22b985c763069fb3b6747cf2242434'
+sha256sums=('849aebb1491c7243e5bb8069d57a69163ed1f47a71f033414a6794081b0e62ec'
             'a1c34d444893d56ae165c8457260e11b729ea2afc10bb9e2690bc89e1f523238'
             '04c8ad254a41350078bba4d56ad54f7b4c0df125029aee021ea0ac632971ebad'
-            '3967f405ebeebd6ebf2c929958d7cc382c3375f4f3189f866af76d3148a95404'
-            '7dda3fcc1a6e7ccdf61b938b64a185011a1b61e40293d7efe8defc0173f15c57')
+            'de0812691154858382233c8957cb5d65c7db1e88430bed2383c3518c5d5c78ce'
+            '92cf60d3ef54625ac32bb6ae7bc2889172bbd16cb5825ee14b1bffc1548291fe')
 
 options=('!strip')
 
-package_notepadpp() {
+package_notepadpp-win64() {
     pkgdesc+=" (64-bit)"
-    arch=('x86_64')
-    conflicts=("notepadpp-win32")
+    conflicts=("notepadpp")
     provides=("notepadpp")
+    replaces=("notepadpp")
+
+    install -d -m755 "${pkgdir}/usr/share/${pkgbase}"
 
-    install -d -m755 "$pkgdir/usr/share/$pkgbase"
+    unzip "npp.${pkgver}.bin.x64.zip" -d "${pkgdir}/usr/share/${pkgbase}"
 
-#    if [ "${CARCH}" == i686 ]; then
-#        unzip "npp.${pkgver}.bin.zip" -d "$pkgdir/usr/share/$pkgbase"
-#    elif [ "${CARCH}" == x86_64 ]; then
-     unzip "npp.${pkgver}.bin.x64.zip" -d "$pkgdir/usr/share/$pkgbase"
-#    fi
+    rm -rf "${pkgdir}/usr/share/${pkgbase}/updater" \
+           "${pkgdir}/usr/share/${pkgbase}/license.txt" \
 
-    rm -rf "$pkgdir/usr/share/$pkgbase/updater" \
-           "$pkgdir/usr/share/$pkgbase/license.txt" \
+    find "${pkgdir}/usr/share/${pkgbase}" -type d -exec chmod 755 "{}" \;
+    find "${pkgdir}/usr/share/${pkgbase}" -type f -exec chmod 644 "{}" \;
 
-    find "$pkgdir/usr/share/$pkgbase" -type d -exec chmod 755 "{}" \;
-    find "$pkgdir/usr/share/$pkgbase" -type f -exec chmod 644 "{}" \;
+    sed -i 's/sedversion/"${pkgver}-${pkgrel}"/' notepadpp
 
-    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 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"
 }
 
 package_notepadpp-win32() {
     pkgdesc+=" (32-bit)"
-    arch=("x86_64")
     conflicts=("notepadpp")
     provides=("notepadpp")
 
-    install -d -m755 "$pkgdir/usr/share/$pkgbase"
+    install -d -m755 "${pkgdir}/usr/share/${pkgbase}"
+
+    unzip "npp.${pkgver}.bin.zip" -d "${pkgdir}/usr/share/${pkgbase}"
 
-    unzip "npp.${pkgver}.bin.zip" -d "$pkgdir/usr/share/$pkgbase"
+    rm -rf "${pkgdir}/usr/share/${pkgbase}/updater" \
+           "${pkgdir}/usr/share/${pkgbase}/license.txt" \
 
-    rm -rf "$pkgdir/usr/share/$pkgbase/updater" \
-           "$pkgdir/usr/share/$pkgbase/license.txt" \
+    find "${pkgdir}/usr/share/${pkgbase}" -type d -exec chmod 755 "{}" \;
+    find "${pkgdir}/usr/share/${pkgbase}" -type f -exec chmod 644 "{}" \;
 
-    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
 
-    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 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"
 }
diff --git a/notepadpp b/notepadpp
index 052f41dedf3a..35d53c86d949 100644
--- a/notepadpp
+++ b/notepadpp
@@ -1,36 +1,55 @@
 #!/usr/bin/env sh
 
-appver="7.6-1"
-pkgdir="/usr/share/notepadpp"
-localdir="$HOME/.local/share/notepadpp"
+app_name='notepadpp'
+app_ver='SED_APPVER'
 
-curr_ver="$(cat "$localdir/notepadpp.ver")"
+pkgdir="/usr/share/${app_name}"
+localdir="${HOME}/.local/share/${app_name}"
+verfile="${localdir}/${app_name}.ver"
 
 unset WINEPREFIX
 
-if [ ! -d "$localdir" ]; then
-    mkdir -p "$localdir" || { echo "Can't create directory"; exit 1; }
+if [ ! "${verfile}" ]; then
+    mkdir -p "${localdir}"
+    touch "${verfile}"
+fi
 
-    cp "$pkgdir/contextMenu.xml" "$localdir/contextMenu.xml"
-    cp "$pkgdir/doLocalConf.xml" "$localdir/doLocalConf.xml"
-    cp "$pkgdir/functionList.xml" "$localdir/functionList.xml"
-    cp "$pkgdir/langs.model.xml" "$localdir/langs.model.xml"
-    cp "$pkgdir/shortcuts.xml" "$localdir/shortcuts.xml"
-    cp "$pkgdir/stylers.model.xml" "$localdir/stylers.model.xml"
+if [ ! "$(cat "${verfile}")" = "${app_ver}" ]; then
+    # Delete broken symlinks and empty dirs
+    find "${localdir}" -xtype l -delete
+    find "${localdir}" -type d -empty -delete
 
-    ln -s "$pkgdir/notepad++.exe" "$localdir/notepadpp"
-    ln -s "$pkgdir/SciLexer.dll" "$localdir/SciLexer.dll"
+    # Copy if file does not exists
+    [ -e "${localdir}/contextMenu.xml" ] || 
+        cp "${pkgdir}/contextMenu.xml"   "${localdir}/contextMenu.xml"
 
-    ln -s "$pkgdir/change.log" "$localdir/change.log"
-    ln -s "$pkgdir/readme.txt" "$localdir/readme.txt"
-    touch "$localdir/notepadpp.ver"
-fi
+    [ -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}"
 
-if [ ! "$appver" = "$curr_ver" ]; then
-    cp -rs "$pkgdir/plugins" "$localdir/plugins"
-    cp -rs "$pkgdir/themes" "$localdir/themes"
-    cp -rs "$pkgdir/localization" "$localdir/localization"
-    echo "$appver" > "$localdir/notepadpp.ver"
+    echo "${app_ver}" > "${verfile}"
 fi
 
-WINEDEBUG=-all wine "$HOME/.local/share/notepadpp/notepadpp" "$@"
+WINEDEBUG=-all wine "${localdir}/${app_name}" "$@"