summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSainnhepark2020-12-04 16:54:03 +0800
committerSainnhepark2020-12-04 16:54:03 +0800
commit5c9faaecd172f3e87922bceb42e3e0f97830b96d (patch)
tree3ec769f1bacf69b8606d3f91739ae18e6e9f5bb5
parent495f274b9fd60a6e31de726cbaf758b61beb23b6 (diff)
downloadaur-5c9faaecd172f3e87922bceb42e3e0f97830b96d.tar.gz
use a shell script to run the hook
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--code-marketplace.hook2
-rw-r--r--code-marketplace.install16
-rwxr-xr-xpatch.sh7
5 files changed, 23 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1abc4fee5732..a74ea9d2df02 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,9 +8,11 @@ pkgbase = code-marketplace
license = unknown
depends = code
source = code-marketplace.hook
+ source = patch.sh
source = code-product.json.patch
source = vscodium-bin-product.json.patch
- md5sums = dc1b0dedb41767bf2511bbeee3715a02
+ md5sums = 86f0c2bc60b5843a41fd9d2f8bab0b5a
+ md5sums = c30c18a4feb9b3558568dbbd7d9c237f
md5sums = 9e476c8aae4243010d6a1c18e56ac402
md5sums = 26be4c7916e72598198d9b3b19945311
diff --git a/PKGBUILD b/PKGBUILD
index db031559ff2f..e315c0cc8bcb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,14 +9,17 @@ license=('unknown')
depends=('code')
install="${pkgname}.install"
source=('code-marketplace.hook'
+ 'patch.sh'
'code-product.json.patch'
'vscodium-bin-product.json.patch')
-md5sums=('dc1b0dedb41767bf2511bbeee3715a02'
+md5sums=('86f0c2bc60b5843a41fd9d2f8bab0b5a'
+ 'c30c18a4feb9b3558568dbbd7d9c237f'
'9e476c8aae4243010d6a1c18e56ac402'
'26be4c7916e72598198d9b3b19945311')
package() {
install -Dm 644 "${srcdir}"/code-marketplace.hook "${pkgdir}"/usr/share/libalpm/hooks/code-marketplace.hook
+ install -Dm 755 "${srcdir}"/patch.sh "${pkgdir}"/usr/share/code-marketplace/patch.sh
install -Dm 644 "${srcdir}"/code-product.json.patch "${pkgdir}"/usr/share/code-marketplace/code-product.json.patch
install -Dm 644 "${srcdir}"/vscodium-bin-product.json.patch "${pkgdir}"/usr/share/code-marketplace/vscodium-bin-product.json.patch
}
diff --git a/code-marketplace.hook b/code-marketplace.hook
index b3048ed25786..f9923b2445c0 100644
--- a/code-marketplace.hook
+++ b/code-marketplace.hook
@@ -7,5 +7,5 @@ Target = usr/share/vscodium-bin/resources/app/product.json
[Action]
Description = Patching product.json...
-Exec = /usr/bin/bash -c "if [ -f /usr/lib/code/product.json ]; then /usr/bin/patch /usr/lib/code/product.json < /usr/share/code-marketplace/code-product.json.patch; elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then /usr/bin/patch /usr/share/vscodium-bin/resources/app/product.json < /usr/share/code-marketplace/vscodium-bin-product.json.patch; fi"
+Exec = /usr/share/code-marketplace/patch.sh
When = PostTransaction
diff --git a/code-marketplace.install b/code-marketplace.install
index 796eed8aad5b..fe2243f8cce7 100644
--- a/code-marketplace.install
+++ b/code-marketplace.install
@@ -1,31 +1,31 @@
post_install() {
if [ -f /usr/lib/code/product.json ]; then
- patch /usr/lib/code/product.json < /usr/share/code-marketplace/code-product.json.patch
+ patch /usr/lib/code/product.json </usr/share/code-marketplace/code-product.json.patch
elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then
- patch /usr/share/vscodium-bin/resources/app/product.json < /usr/share/code-marketplace/vscodium-bin-product.json.patch
+ patch /usr/share/vscodium-bin/resources/app/product.json </usr/share/code-marketplace/vscodium-bin-product.json.patch
fi
}
pre_upgrade() {
if [ -f /usr/lib/code/product.json ]; then
- patch -R /usr/lib/code/product.json < /usr/share/code-marketplace/code-product.json.patch
+ patch -R /usr/lib/code/product.json </usr/share/code-marketplace/code-product.json.patch
elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then
- patch -R /usr/share/vscodium-bin/resources/app/product.json < /usr/share/code-marketplace/vscodium-bin-product.json.patch
+ patch -R /usr/share/vscodium-bin/resources/app/product.json </usr/share/code-marketplace/vscodium-bin-product.json.patch
fi
}
post_upgrade() {
if [ -f /usr/lib/code/product.json ]; then
- patch /usr/lib/code/product.json < /usr/share/code-marketplace/code-product.json.patch
+ patch /usr/lib/code/product.json </usr/share/code-marketplace/code-product.json.patch
elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then
- patch /usr/share/vscodium-bin/resources/app/product.json < /usr/share/code-marketplace/vscodium-bin-product.json.patch
+ patch /usr/share/vscodium-bin/resources/app/product.json </usr/share/code-marketplace/vscodium-bin-product.json.patch
fi
}
pre_remove() {
if [ -f /usr/lib/code/product.json ]; then
- patch -R /usr/lib/code/product.json < /usr/share/code-marketplace/code-product.json.patch
+ patch -R /usr/lib/code/product.json </usr/share/code-marketplace/code-product.json.patch
elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then
- patch -R /usr/share/vscodium-bin/resources/app/product.json < /usr/share/code-marketplace/vscodium-bin-product.json.patch
+ patch -R /usr/share/vscodium-bin/resources/app/product.json </usr/share/code-marketplace/vscodium-bin-product.json.patch
fi
}
diff --git a/patch.sh b/patch.sh
new file mode 100755
index 000000000000..87b3a3b004a8
--- /dev/null
+++ b/patch.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+if [ -f /usr/lib/code/product.json ]; then
+ patch /usr/lib/code/product.json </usr/share/code-marketplace/code-product.json.patch
+elif [ -f /usr/share/vscodium-bin/resources/app/product.json ]; then
+ patch /usr/share/vscodium-bin/resources/app/product.json </usr/share/code-marketplace/vscodium-bin-product.json.patch
+fi