upgpkg: postman 7.2.2-1

upstream release

Update postman

6 files changed, 70 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index daf2b0749281..e71d6bda3064 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,25 @@
 pkgbase = postman
 	pkgdesc = Build, test, and document your APIs faster
-	pkgver = 6.2.4
+	pkgver = 7.2.2
 	pkgrel = 1
-	url = https://www.getpostman.com
+	url = https://www.getpostman.com/downloads/
 	arch = x86_64
-	license = custom
-	depends = electron
+	arch = i686
+	license = custom:Postman UELA
+	depends = electron2
+	provides = postman
 	conflicts = postman-bin
-	source = postman-6.2.4.zip::https://dl.pstmn.io/download/version/6.2.4/linux64
-	source = remove-updater.patch
-	source = https://archive.archlinux.org/packages/e/electron/electron-1.8.4-2-x86_64.pkg.tar.xz
-	sha256sums = 79d89b92e8e69d0f7080f3fc25cf30108ba2da0b5587b19851d09dd3c2100c3c
-	sha256sums = eebcce1e81824b61fd64ccb2c08ec2c7c06a0aacdc4fdc14d6b06ecd92ceed8e
-	sha256sums = dd9c6756bd61abbaae58fdeade5570f771fe8d6f0de14f1e5a710e42f0bf35c2
+	options = !strip
+	source = EULA.pdf::https://www.getpostman.com/terms/Postman_EULA_May_2018.pdf
+	source = postman.desktop
+	source = postman.sh
+	sha256sums = bbc2f4a8db8fa55d854f7fe4a41339dd02522b7e77879fc7b6796819bceb9a33
+	sha256sums = cf4b62b0fccdec77a24abc350a03082a521fc1bc533feb1781e83a4a170424b2
+	sha256sums = 4fa4f470c3f83712a92e8b91e062fb187e560531431084dd0d4d39326decb477
+	source_x86_64 = postman-7.2.2-x86_64.src.tar.gz::https://dl.pstmn.io/download/version/7.2.2/linux64
+	sha256sums_x86_64 = 9810b4de280e0c7107eb5b0a5ef29e6c7c93d4f807426f14b165f83a413307e2
+	source_i686 = postman-7.2.2-i686.src.tar.gz::https://dl.pstmn.io/download/version/7.2.2/linux32
+	sha256sums_i686 = de7eed9c3a4077916b1c15dfa2a2f96f38728d850f3f2cf853c7655f5f6edc59
 
 pkgname = postman
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..8c28fc55880d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+src
+pkg
+EULA.pdf
+*.part
+*.src.tar.gz
+*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index a759f3f2d543..d14a0ba9e54f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,76 +1,45 @@
-# Maintainer: kitsunyan <`echo a2l0c3VueWFuQGFpcm1haWwuY2MK | base64 -d`>
-
+# Maintainer: Bruce Zhang
 pkgname=postman
-pkgver=6.2.4
+pkgver=7.2.2
 pkgrel=1
 pkgdesc='Build, test, and document your APIs faster'
-arch=('x86_64')
-url='https://www.getpostman.com'
-license=('custom')
-depends=(electron)
-conflicts=(postman-bin)
-source=("postman-$pkgver.zip::https://dl.pstmn.io/download/version/${pkgver}/linux64"
-        'remove-updater.patch'
-        'https://archive.archlinux.org/packages/e/electron/electron-1.8.4-2-x86_64.pkg.tar.xz')
-sha256sums=('79d89b92e8e69d0f7080f3fc25cf30108ba2da0b5587b19851d09dd3c2100c3c'
-            'eebcce1e81824b61fd64ccb2c08ec2c7c06a0aacdc4fdc14d6b06ecd92ceed8e'
-            'dd9c6756bd61abbaae58fdeade5570f771fe8d6f0de14f1e5a710e42f0bf35c2')
-
-prepare() {
-  cd "$srcdir/Postman/app/resources/app"
-
-  # remove updater from settings and menu, disable updates and analytics
-  patch -Np1 -r - --no-backup-if-mismatch -i "$srcdir/remove-updater.patch"
-}
+arch=('x86_64' 'i686')
+url='https://www.getpostman.com/downloads/'
+license=('custom:Postman UELA')
+depends=('electron2')
+provides=('postman')
+conflicts=('postman-bin')
+options=('!strip')
+source_x86_64=(
+  "$pkgname-$pkgver-x86_64.src.tar.gz::https://dl.pstmn.io/download/version/$pkgver/linux64"
+)
+source_i686=(
+  "$pkgname-$pkgver-i686.src.tar.gz::https://dl.pstmn.io/download/version/$pkgver/linux32"
+)
+source=(
+  "EULA.pdf::https://www.getpostman.com/terms/Postman_EULA_May_2018.pdf"
+  "postman.desktop"
+  "postman.sh"
+)
+sha256sums=('bbc2f4a8db8fa55d854f7fe4a41339dd02522b7e77879fc7b6796819bceb9a33'
+            'cf4b62b0fccdec77a24abc350a03082a521fc1bc533feb1781e83a4a170424b2'
+            '4fa4f470c3f83712a92e8b91e062fb187e560531431084dd0d4d39326decb477')
+sha256sums_x86_64=('9810b4de280e0c7107eb5b0a5ef29e6c7c93d4f807426f14b165f83a413307e2')
+sha256sums_i686=('de7eed9c3a4077916b1c15dfa2a2f96f38728d850f3f2cf853c7655f5f6edc59')
 
 package() {
-  cd "$srcdir/Postman/app"
-
-  mkdir -p "$pkgdir/usr/lib/"
-  cp -rp 'resources/app' "$pkgdir/usr/lib/postman"
-
-  # install electron 1.8.4 (postman will not work with electron>=2.0.0)
-  mkdir -p "$pkgdir/usr/lib/electron-postman"
-  find "$srcdir/usr/lib/electron" -mindepth 1 -maxdepth 1 -print0 | while read -rd '' line; do
-    local name="`basename "$line"`"
-    { [ "${name: -4}" = '.pak' ] ||
-    [ "$name" = 'icudtl.dat' ] ||
-    [ "$name" = 'locales' ] ||
-    [ "$name" = 'node' ]; } && {
-      ln -sf "../electron/$name" "$pkgdir/usr/lib/electron-postman/$name"
-      true
-    } || {
-      cp -rp "$line" "$pkgdir/usr/lib/electron-postman/$name"
-      true
-    }
-  done
+  cd "$srcdir/Postman/app/resources/app"
 
-  # install licenses
-  find . -maxdepth 1 -iname 'license*' -print0 |
-  xargs -n 1 -0 -I {} install -Dm644 {} "$pkgdir/usr/share/licenses/$pkgname/{}"
+  # Install Postman app resource
+  find . -type f -exec install -Dm644 {} "$pkgdir/usr/share/postman/app/{}" \;
 
-  # create run script
-  mkdir -p "$pkgdir/usr/bin"
-  printf '%s\n' \
-  '#!/bin/sh' \
-  'exec /usr/lib/electron-postman/electron /usr/lib/postman "$@"' \
-  > "$pkgdir/usr/bin/postman"
-  chmod a+x "$pkgdir/usr/bin/postman"
+  # Install bin
+  install -Dm755 "$srcdir/postman.sh" "$pkgdir/usr/bin/postman"
 
-  # create desktop file
-  mkdir -p "$pkgdir/usr/share/applications"
-  printf '%s\n' \
-  '[Desktop Entry]' \
-  'Name=Postman' \
-  'Comment=Build, test, and document your APIs faster' \
-  'Exec=/usr/bin/postman %U' \
-  'Terminal=false' \
-  'Type=Application' \
-  'Icon=postman' \
-  'Categories=Development;Utility;' \
-  > "$pkgdir/usr/share/applications/postman.desktop"
+  # Install desktop
+  install -Dm755 "$srcdir/postman.desktop" "$pkgdir/usr/share/applications/postman.desktop"
 
-  # create icons
-  install -Dm644 'resources/app/assets/icon.png' \
-  "$pkgdir/usr/share/icons/hicolor/128x128/apps/postman.png"
+  # Install icons & eula
+  install -Dm644 "$srcdir/Postman/app/resources/app/assets/icon.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/postman.png"
+  install -Dm644 "$srcdir/EULA.pdf" "$pkgdir/usr/share/licenses/postman/EULA.pdf"
 }
diff --git a/postman.desktop b/postman.desktop
new file mode 100644
index 000000000000..34ca8c7690f0
--- /dev/null
+++ b/postman.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Postman
+Comment=Build, test, and document your APIs faster
+Exec=/bin/postman %U
+Icon=postman
+Type=Application
+StartupNotify=true
+Categories=Development;Utility;
+StartupWMClass=Postman
+MimeType=x-scheme-handler/postman
diff --git a/postman.sh b/postman.sh
new file mode 100644
index 000000000000..310b08f1c298
--- /dev/null
+++ b/postman.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+exec electron2 /usr/share/postman/app
diff --git a/remove-updater.patch b/remove-updater.patch
deleted file mode 100644
index 48b6a5bb03ba..000000000000
--- a/remove-updater.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/services/menuManager.js
-+++ b/services/menuManager.js
-@@ -19,5 +19,0 @@
--          {
--            label: 'Check for Updates...',
--            click: function (menuItem, browserWindow, options) { menuManager.handleMenuAction('checkElectronUpdates', null, options); }
--          },
--          { type: 'separator' },
-@@ -362,5 +357,0 @@
--          {
--            label: 'Check for Updates',
--            click: function (menuItem, browserWindow, options) { menuManager.handleMenuAction('checkElectronUpdates', null, options); }
--          },
--          { type: 'separator' },
---- a/js/RequesterModalContainer.js
-+++ b/js/RequesterModalContainer.js
-@@ -13086,3 +12086,0 @@
--              __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_5__components_settings_SettingsTabContent__["a" /* default */], { key: __WEBPACK_IMPORTED_MODULE_16__constants_SettingsTypeConstants__["j" /* SETTINGS_UPDATE */] },
--                __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_10__SettingsUpdateContainer__["a" /* default */], null)),
--
-@@ -13138,1 +13135,0 @@
--          __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_1__base_Tabs__["a" /* Tab */], { refKey: __WEBPACK_IMPORTED_MODULE_2__constants_SettingsTypeConstants__["j" /* SETTINGS_UPDATE */] }, 'Update'),
---- a/js/vendor-shared.js
-+++ b/js/vendor-shared.js
-@@ -76714,2 +76714,2 @@
--window.DISABLE_ANALYTICS = false;
--window.DISABLE_UPDATES = false;
-+window.DISABLE_ANALYTICS = true;
-+window.DISABLE_UPDATES = true;