Upstream updates

- Bump in version number.
- Tweaks to commands used in prepare().
- Edited comments.

3 files changed, 50 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bda86cc4f4b6..6ed71a2f84da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,24 @@
 pkgbase = simplenote-electron-arm-bin
 	pkgdesc = The simplest way to keep notes
-	pkgver = 2.4.0
+	pkgver = 2.5.0
 	pkgrel = 1
 	url = https://github.com/Automattic/simplenote-electron
 	arch = armv7h
 	arch = aarch64
 	license = GPL2
-	depends = nss
 	depends = gtk3
 	depends = libxss
+	depends = nss
 	optdepends = libnotify: desktop notifications
 	optdepends = noto-fonts-emoji: emoji support
 	optdepends = ttf-joypixels: emoji support
 	provides = simplenote
-	noextract = simplenote-electron-2.4.0-aarch64.AppImage
+	noextract = simplenote-electron-2.5.0-aarch64.AppImage
 	options = !strip
-	source_armv7h = simplenote-electron-2.4.0-armv7h.AppImage::https://github.com/Automattic/simplenote-electron/releases/download/v2.4.0/Simplenote-linux-2.4.0-armv7l.AppImage
-	b2sums_armv7h = d646487d3ea2bc4938803df7d7523b8b3eeba0076bfd922de5d7b65b6eef31c216de792fdf8f6e488d3d871d1a9bc81facdc2283aea88d076b3e6bf4e92564d0
-	source_aarch64 = simplenote-electron-2.4.0-aarch64.AppImage::https://github.com/Automattic/simplenote-electron/releases/download/v2.4.0/Simplenote-linux-2.4.0-arm64.AppImage
-	b2sums_aarch64 = 50250e6250388ecf2091b02a981d0dd9113b649c751af844ce8ede3c5993774afe9283670d60530775a2005ee2309910b7ddeab3549b0d481f318527518d1bf7
+	source_armv7h = simplenote-electron-2.5.0-armv7h.AppImage::https://github.com/Automattic/simplenote-electron/releases/download/v2.5.0/Simplenote-linux-2.5.0-armv7l.AppImage
+	b2sums_armv7h = 23da95334418715375f484e1549dcd8a4107f07fa963053045701b16b8b5ba5b26afac25e0ccd0401895828a30db4c8d40d8b77a61193825fca04918184ff7fa
+	source_aarch64 = simplenote-electron-2.5.0-aarch64.AppImage::https://github.com/Automattic/simplenote-electron/releases/download/v2.5.0/Simplenote-linux-2.5.0-arm64.AppImage
+	b2sums_aarch64 = f28a8f71b80c2e17d531cb860708f6ca441a0c27c214b30daf96d5eb138f93f070090e30dee7a7c485556a5f33f2c8fb3d6bc0afc9da6fd0ebc1bd6f69db98d1
 
 pkgname = simplenote-electron-arm-bin
 
diff --git a/.gitignore b/.gitignore
index a2d31d939c46..be8f044ea8de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,18 @@
+*.tar
+*.tar.*
+*.jar
+*.exe
+*.msi
 *.AppImage
-*.pkg.tar.zst
+*.deb
+*.rpm
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+src/
 pkg/
+
 squashfs-root/
-src/
diff --git a/PKGBUILD b/PKGBUILD
index b5d8ab2a5cdb..a7b9d44d7312 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Feakster <feakster at posteo dot eu>
 
+### Info ###
 pkgname=simplenote-electron-arm-bin
 _pkgname=${pkgname%-electron-arm-bin}
-pkgver=2.4.0
+pkgver=2.5.0
 _appimage="simplenote-electron-${pkgver}-${CARCH}.AppImage"
 pkgrel=1
 pkgdesc='The simplest way to keep notes'
 arch=('armv7h' 'aarch64')
 url='https://github.com/Automattic/simplenote-electron'
 license=('GPL2')
-depends=(nss gtk3 libxss)
+depends=('gtk3' 'libxss' 'nss')
 optdepends=(
     'libnotify: desktop notifications'
     'noto-fonts-emoji: emoji support'
@@ -20,47 +21,51 @@ options=(!strip)
 source_armv7h=("simplenote-electron-${pkgver}-armv7h.AppImage"::"${url}/releases/download/v${pkgver}/Simplenote-linux-${pkgver}-armv7l.AppImage")
 source_aarch64=("simplenote-electron-${pkgver}-aarch64.AppImage"::"${url}/releases/download/v${pkgver}/Simplenote-linux-${pkgver}-arm64.AppImage")
 noextract=($_appimage)
-b2sums_armv7h=('d646487d3ea2bc4938803df7d7523b8b3eeba0076bfd922de5d7b65b6eef31c216de792fdf8f6e488d3d871d1a9bc81facdc2283aea88d076b3e6bf4e92564d0')
-b2sums_aarch64=('50250e6250388ecf2091b02a981d0dd9113b649c751af844ce8ede3c5993774afe9283670d60530775a2005ee2309910b7ddeab3549b0d481f318527518d1bf7')
+b2sums_armv7h=('23da95334418715375f484e1549dcd8a4107f07fa963053045701b16b8b5ba5b26afac25e0ccd0401895828a30db4c8d40d8b77a61193825fca04918184ff7fa')
+b2sums_aarch64=('f28a8f71b80c2e17d531cb860708f6ca441a0c27c214b30daf96d5eb138f93f070090e30dee7a7c485556a5f33f2c8fb3d6bc0afc9da6fd0ebc1bd6f69db98d1')
 
+### Prepare ###
 prepare() {
-    # Go to Source Directory
+    ## Change Directory ##
     cd "$srcdir"
 
-    # Mark AppImage as Executable
+    ## Mark AppImage as Executable ##
     chmod a+x $_appimage
 
-    # Extract AppImage into squashfs-root Directory
+    ## Extract AppImage into squashfs-root Directory ##
     ./$_appimage --appimage-extract
 
-    # Set Permissions for squashfs-root Filesystem Directories
-    find squashfs-root -type d -exec chmod 755 {} +
+    ## Fix Permissions ##
+    find squashfs-root -type d -exec chmod 755 {} \;
 
-    # Modify Desktop File
-    sed -i -E "s|Exec=AppRun|Exec=/usr/bin/${_pkgname}|" squashfs-root/${_pkgname}.desktop
-    sed -i '/^X-AppImage-Version=.*/d' squashfs-root/${_pkgname}.desktop
-    sed -i '/^Path=.*/d' squashfs-root/${_pkgname}.desktop
+    ## Modify Desktop File ##
+    sed -i \
+    -e "s|^Exec=AppRun$|Exec=/usr/bin/${_pkgname}|" \
+    -e '/^X-AppImage-Version=.*/d' \
+    -e '/^Path=.*/d' \
+    squashfs-root/${_pkgname}.desktop
     echo "Path=/opt/${_pkgname}" >> squashfs-root/${_pkgname}.desktop
 }
 
+### Package ###
 package() {
-    # Go to source directory
+    ## Change Directory ##
     cd "$srcdir"
 
-    # Create Installation Directory Structure
-    install -dm0755 "$pkgdir"/usr/bin
-    install -dm0755 "$pkgdir"/opt/$_pkgname
-    install -dm0755 "$pkgdir"/usr/share/icons
+    ## Create Installation Directory Structure ##
+    install -dm755 "$pkgdir"/usr/bin
+    install -dm755 "$pkgdir"/opt/$_pkgname
+    install -dm755 "$pkgdir"/usr/share/icons
 
-    # Install Icons
+    ## Install Icons ##
     cp -RL squashfs-root/usr/share/icons/hicolor "$pkgdir"/usr/share/icons/
 
-    # Install Desktop File
+    ## Install Desktop File ##
     install -Dm644 squashfs-root/${_pkgname}.desktop -t "$pkgdir"/usr/share/applications/
 
-    # Move AppImage Contents to /opt/$_pkgname
+    ## Move AppImage Contents to /opt/$_pkgname ##
     cp -RLT squashfs-root "$pkgdir"/opt/$_pkgname
-    
-    # Symlink /usr/bin Executable to /opt/$_pkgname
+
+    ## Symlink /usr/bin Executable to /opt/$_pkgname ##
     ln -s /opt/$_pkgname/$_pkgname "$pkgdir"/usr/bin/$_pkgname
 }