summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Lucas2019-07-10 16:21:46 -0400
committerJean Lucas2019-07-10 16:23:01 -0400
commit6e134d260f63e5c48bb4b27307f6985d417d620f (patch)
tree5d8f1f968f1b8f53ec1b3bc60a8c71b1b63cc44f
parent71623f93a7851ecfd634ea1053671eb43bac82fc (diff)
downloadaur-6e134d260f63e5c48bb4b27307f6985d417d620f.tar.gz
Revert back to external executable
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD19
-rw-r--r--meteor.install4
-rw-r--r--meteor.sh7
4 files changed, 18 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1ec44f928a1..2dea65212da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Apr 8 06:04:43 UTC 2019
pkgbase = meteor
pkgdesc = Full-stack JavaScript platform for developing modern web and mobile applications
pkgver = 1.8.1
- pkgrel = 1
+ pkgrel = 2
url = https://www.meteor.com
install = meteor.install
arch = i686
@@ -12,6 +10,8 @@ pkgbase = meteor
depends = nodejs
depends = mongodb
options = !strip
+ source = meteor.sh
+ sha512sums = b81f2da94d2732eacd4499be2b68e8410c334aa874907ce985fe59508a030371a37addc74f583dfdbef30c394385d2c941e565991dbbc4074908b9e4a8cb7036
source_i686 = meteor-1.8.1-i686.tar.gz::https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.8.1/meteor-bootstrap-os.linux.x86_32.tar.gz
sha512sums_i686 = e7b7f814e94b247afcb7cabdaec6a3f830fc3a421e056a0ce2118871e027f3fc2325000bf303a20c79ead47160a96b111a7708d508f9e9a72ac8d8930092c42a
source_x86_64 = meteor-1.8.1-x86_64.tar.gz::https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.8.1/meteor-bootstrap-os.linux.x86_64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index d399f1c3ab4..dd11c40dbba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
pkgname=meteor
pkgver=1.8.1
-pkgrel=1
+pkgrel=2
pkgdesc='Full-stack JavaScript platform for developing modern web and mobile applications'
arch=(i686 x86_64)
url=https://www.meteor.com
@@ -20,26 +20,17 @@ license=(MIT)
depends=(nodejs mongodb)
options=(!strip)
install=meteor.install
+source=(meteor.sh)
source_i686=(meteor-$pkgver-i686.tar.gz::https://meteorinstall-4168.kxcdn.com/packages-bootstrap/$pkgver/meteor-bootstrap-os.linux.x86_32.tar.gz)
source_x86_64=(meteor-$pkgver-x86_64.tar.gz::https://meteorinstall-4168.kxcdn.com/packages-bootstrap/$pkgver/meteor-bootstrap-os.linux.x86_64.tar.gz)
+sha512sums=('b81f2da94d2732eacd4499be2b68e8410c334aa874907ce985fe59508a030371a37addc74f583dfdbef30c394385d2c941e565991dbbc4074908b9e4a8cb7036')
sha512sums_i686=('e7b7f814e94b247afcb7cabdaec6a3f830fc3a421e056a0ce2118871e027f3fc2325000bf303a20c79ead47160a96b111a7708d508f9e9a72ac8d8930092c42a')
sha512sums_x86_64=('c92d1e529741a7b8c6dccb2db50096d05546e15d80294e2cc42ae7596d54d4813415a660c3a64c741f58dadd6387bc9aa7448fc6afee5e2c81e0dd4c31bb55e1')
package() {
- install -d "$pkgdir"/usr/{share,bin}
-
# Copy base Meteor tree to universally-accessible location
+ mkdir "$pkgdir"/usr/share
cp -a .meteor "$pkgdir"/usr/share/meteor
- # Create our executable
- cat > "$pkgdir"/usr/bin/meteor << EOF
-#!/bin/sh
-
-if [ ! -d "\$HOME"/.meteor ]; then
- mkdir "\$HOME"/.meteor
- cp -r /usr/share/meteor/* "\$HOME"/.meteor
-fi
-
-"\$HOME"/.meteor/meteor "\$@"
-EOF
+ install -D meteor.sh "$pkgdir"/usr/bin/meteor
}
diff --git a/meteor.install b/meteor.install
index aa710ac5f7c..74b2dc90485 100644
--- a/meteor.install
+++ b/meteor.install
@@ -1,5 +1,7 @@
post_install() {
- echo "Meteor is not meant to be upgraded via the binary download, since a Meteor tree needs to be owned by a regular user. First run of \`meteor\` per user will copy the binary tree to ~/.meteor. Subsequent use will run Meteor from your tree. On Arch package version increment - to upgrade your tree, either delete it and run \`meteor\` to copy the new tree over, or manually sync the changes from /usr/share/meteor over to it (e.g. using \`rsync -rl --delete /usr/share/meteor/ ~/.meteor\`)."
+ echo "Meteor is not meant to be upgraded via the binary download, since a Meteor tree needs to be owned by a regular user."
+ echo "First run of \`meteor\` per user will copy the tree to ~/.meteor. Subsequent use will run Meteor from that tree."
+ echo "On Arch package version increment: To upgrade your tree, either delete it and run \`meteor\` to copy the new tree over, or manually sync the changes from /usr/share/meteor over to it (e.g. using \`rsync -aAXv --delete /usr/share/meteor/ ~/.meteor/\`)."
}
post_upgrade() {
diff --git a/meteor.sh b/meteor.sh
new file mode 100644
index 00000000000..8d5f0d0990d
--- /dev/null
+++ b/meteor.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ ! -d "$HOME"/.meteor ]; then
+ cp -a /usr/share/meteor "$HOME"/.meteor
+fi
+
+"$HOME"/.meteor/meteor "$@"