summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAliaksandr Stelmachonak2018-09-01 02:29:41 -0400
committerAliaksandr Stelmachonak2018-09-01 02:29:41 -0400
commit7cda12d544b627393dd2006a28a4074b57af0621 (patch)
tree1f3295f48a9d3039a282616bdb784d6bbac961ce
parent318b7a415f200a1bc00eb0766837b8d77bf5dbf6 (diff)
downloadaur-7cda12d544b627393dd2006a28a4074b57af0621.tar.gz
Updated to latest version, fixes and workarounds for the new issues
-rw-r--r--PKGBUILD13
-rw-r--r--cros-container-guest-tools.install2
2 files changed, 7 insertions, 8 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 3c387107775c..49eb22039830 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
_pkgname=cros-container-guest-tools
pkgname=${_pkgname}-git
-pkgver=r48.e25d12d
+pkgver=r86.53b1b97
pkgrel=1
pkgdesc="Guest tools for the Crostini containers on ChromeOS"
arch=('any')
@@ -47,8 +47,12 @@ package() {
install -m755 -D ${srcdir}/${_pkgname}/cros-garcon/garcon-url-handler \
${pkgdir}/usr/bin/garcon-url-handler
+ install -m755 -D ${srcdir}/${_pkgname}/cros-garcon/garcon-terminal-handler \
+ ${pkgdir}/usr/bin/garcon-terminal-handler
install -m644 -D ${srcdir}/${_pkgname}/cros-garcon/garcon_host_browser.desktop \
${pkgdir}/usr/share/applications/garcon_host_browser.desktop
+ install -m644 -D ${srcdir}/${_pkgname}/cros-garcon/skel.cros-garcon.conf \
+ ${pkgdir}/etc/skel/.config/cros-garcon.conf
install -m644 -D ${srcdir}/${_pkgname}/cros-garcon/cros-garcon.service \
${pkgdir}/usr/lib/systemd/user/cros-garcon.service
install -m644 -D ${srcdir}/${_pkgname}/cros-garcon/cros-garcon-override.conf \
@@ -73,19 +77,16 @@ package() {
### cros-sommelier
-# Uncomment after https://bugs.archlinux.org/task/58701 is fixed
-
-# ln -sf /opt/google/cros-containers/bin/sommelier \
-# ${pkgdir}/usr/bin/sommelier
-
install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier/sommelierrc \
${pkgdir}/etc/sommelierrc
install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier/sommelier.sh \
${pkgdir}/etc/profile.d/sommelier.sh
install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier/sommelier@.service \
${pkgdir}/usr/lib/systemd/user/sommelier@.service
+ sed -i 's|=/usr|=/opt/google/cros-containers|g' ${pkgdir}/usr/lib/systemd/user/sommelier@.service
install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier/sommelier-x@.service \
${pkgdir}/usr/lib/systemd/user/sommelier-x@.service
+ sed -i 's|=/usr|=/opt/google/cros-containers|g' ${pkgdir}/usr/lib/systemd/user/sommelier-x@.service
ln -sf ../sommelier@.service \
${pkgdir}/usr/lib/systemd/user/default.target.wants/sommelier@0.service
ln -sf ../sommelier-x@.service \
diff --git a/cros-container-guest-tools.install b/cros-container-guest-tools.install
index 829387482d5a..fc26032746ab 100644
--- a/cros-container-guest-tools.install
+++ b/cros-container-guest-tools.install
@@ -10,7 +10,6 @@ post_install() {
# workaround for https://bugs.archlinux.org/task/58701 - remove after fix
ln -sf /opt/google/cros-containers/cros-adapta /usr/share/themes/CrosAdapta
- ln -sf /opt/google/cros-containers/bin/sommelier /usr/bin/sommelier
# set default browser to the garcon_host_browser handler
if hash xdg-settings; then
@@ -46,6 +45,5 @@ post_remove() {
# workaround for https://bugs.archlinux.org/task/58701 - remove after fix
rm /usr/share/themes/CrosAdapta
- rm /usr/bin/sommelier
}