PKGBUILD cleanup

2 files changed, 59 insertions, 95 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f3031b207ded..2782b06d0ae9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -23,15 +23,13 @@ pkgver() {
 
 package() {
 
-	# License
-	install -m644 -D ${srcdir}/${_pkgname}/LICENSE \
-					 ${pkgdir}/usr/share/licenses/cros-container-guest-tools/LICENSE
+	# license
+	install -m644 -D ${srcdir}/${_pkgname}/LICENSE ${pkgdir}/usr/share/licenses/cros-container-guest-tools/LICENSE
 
 	# install locale fix (to override C.UTF-8 locale, set to container by termina)
-	install -m755 -D ${srcdir}/cros-locale.sh \
-					 ${pkgdir}/etc/profile.d/cros-locale.sh
+	install -m755 -D ${srcdir}/cros-locale.sh ${pkgdir}/etc/profile.d/cros-locale.sh
 
-	# Create required folder structure for systemd units
+	# create required folder structure for systemd units
 	mkdir -p ${pkgdir}/usr/lib/systemd/user/default.target.wants
 	mkdir -p ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants
 
@@ -40,74 +38,71 @@ package() {
 #   Uncomment after https://bugs.archlinux.org/task/58701 is fixed
 #
 #	mkdir -p ${pkgdir}/usr/share/themes
-#	ln -sf /opt/google/cros-containers/cros-adapta \
-#		   ${pkgdir}/usr/share/themes/CrosAdapta
+#	ln -sf /opt/google/cros-containers/cros-adapta ${pkgdir}/usr/share/themes/CrosAdapta
 
 	### cros-apt-config -> not applicable
 
 	### cros-garcon
 
-	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 \
-					 ${pkgdir}/usr/lib/systemd/user/cros-garcon.service.d/cros-garcon-override.conf
-	install -m644 -D ${srcdir}/cros-garcon-conditions.conf \
-					 ${pkgdir}/usr/lib/systemd/user/cros-garcon.service.d/cros-garcon-conditions.conf
-	ln -sf ../cros-garcon.service \
-		   ${pkgdir}/usr/lib/systemd/user/default.target.wants/cros-garcon.service
-
-	install -m644 -D ${srcdir}/cros-garcon.hook \
-                     ${pkgdir}/usr/share/libalpm/hooks/cros-garcon.hook
+	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 ${pkgdir}/usr/lib/systemd/user/cros-garcon.service.d/cros-garcon-override.conf
+	install -m644 -D ${srcdir}/cros-garcon-conditions.conf ${pkgdir}/usr/lib/systemd/user/cros-garcon.service.d/cros-garcon-conditions.conf
+	install -m644 -D ${srcdir}/cros-garcon.hook ${pkgdir}/usr/share/libalpm/hooks/cros-garcon.hook
+	ln -sf ../cros-garcon.service ${pkgdir}/usr/lib/systemd/user/default.target.wants/cros-garcon.service
+
+	### cros-gpu -> not applicable
+
+	### cros-gpu-alpha -> not applicable
 
 	### cros-guest-tools -> not applicable
 
 	### cros-notificationd
 
 	install -m644 -D ${srcdir}/${_pkgname}/cros-notificationd/org.freedesktop.Notifications.service \
-					 ${pkgdir}/usr/share/dbus-1/services/org.freedesktop.Notifications.service
+		${pkgdir}/usr/share/dbus-1/services/org.freedesktop.Notifications.service
 
 	### cros-pulse-config
 
-	install -m644 -D ${srcdir}/${_pkgname}/cros-pulse-config/cros-pulse-config.service \
-					 ${pkgdir}/usr/lib/systemd/user/cros-pulse-config.service
-	ln -sf ../cros-pulse-config.service \
-		   ${pkgdir}/usr/lib/systemd/user/default.target.wants/cros-pulse-config.service
+	install -m644 -D ${srcdir}/${_pkgname}/cros-pulse-config/cros-pulse-config.service ${pkgdir}/usr/lib/systemd/user/cros-pulse-config.service
+	ln -sf ../cros-pulse-config.service ${pkgdir}/usr/lib/systemd/user/default.target.wants/cros-pulse-config.service
 
 	### cros-sftp
 
-	install -m644 -D ${srcdir}/${_pkgname}/cros-sftp/cros-sftp.service \
-					 ${pkgdir}/usr/lib/systemd/system/cros-sftp.service
-	ln -sf ../cros-sftp.service \
-		   ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants/cros-sftp.service
-
-	# workaround for https://github.com/systemd/systemd/issues/12401
-	install -m644 -D ${srcdir}/cros-logind-override.conf \
-			${pkgdir}/usr/lib/systemd/system/systemd-logind.service.d/cros-logind-override.conf
+	install -m644 -D ${srcdir}/${_pkgname}/cros-sftp/cros-sftp.service ${pkgdir}/usr/lib/systemd/system/cros-sftp.service
+	ln -sf ../cros-sftp.service ${pkgdir}/usr/lib/systemd/system/multi-user.target.wants/cros-sftp.service
 
 	# add drop-in for cros-sftp to check if required ssh artifacts were bind-mounted before starting
-	install -m644 -D ${srcdir}/cros-sftp-conditions.conf \
-					 ${pkgdir}/usr/lib/systemd/system/cros-sftp.service.d/cros-sftp-conditions.conf
+	install -m644 -D ${srcdir}/cros-sftp-conditions.conf ${pkgdir}/usr/lib/systemd/system/cros-sftp.service.d/cros-sftp-conditions.conf
+
+	### cros-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 -e 's|=/usr|=/opt/google/cros-containers|g' -e 's|/usr/share/fonts/X11|/usr/share/fonts|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@.service ${pkgdir}/usr/lib/systemd/user/default.target.wants/sommelier@1.service
+	ln -sf ../sommelier-x@.service ${pkgdir}/usr/lib/systemd/user/default.target.wants/sommelier-x@0.service
+	ln -sf ../sommelier-x@.service ${pkgdir}/usr/lib/systemd/user/default.target.wants/sommelier-x@1.service
 
 	### cros-sommelier-config
 
-	# Reserve more hotkeys for ChromeOS to allow them work with/in Linux apps as well
-	sed -i \
-		-e 's|<Alt>bracketleft,<Alt>bracketright|<Alt>bracketleft,<Alt>bracketright,<Alt>minus,<Alt>equal,<Alt>1,<Alt>2,<Alt>3,<Alt>4,<Alt>5,<Alt>6,<Alt>7,<Alt>8,<Alt>9|g' \
+	# reserve more hotkeys for ChromeOS to allow them work with/in Linux apps as well
+	sed -i -e \
+		's|<Alt>bracketleft,<Alt>bracketright|<Alt>bracketleft,<Alt>bracketright,<Alt>minus,<Alt>equal,<Alt>1,<Alt>2,<Alt>3,<Alt>4,<Alt>5,<Alt>6,<Alt>7,<Alt>8,<Alt>9|g' \
 		${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-override.conf
 
-	sed -i \
-		-e 's|<Alt>bracketleft,<Alt>bracketright|<Alt>bracketleft,<Alt>bracketright,<Alt>minus,<Alt>equal,<Alt>1,<Alt>2,<Alt>3,<Alt>4,<Alt>5,<Alt>6,<Alt>7,<Alt>8,<Alt>9|g' \
+	sed -i -e \
+		's|<Alt>bracketleft,<Alt>bracketright|<Alt>bracketleft,<Alt>bracketright,<Alt>minus,<Alt>equal,<Alt>1,<Alt>2,<Alt>3,<Alt>4,<Alt>5,<Alt>6,<Alt>7,<Alt>8,<Alt>9|g' \
 		${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-x-override.conf
 
-	# Set LIBGL_DRIVERS_PATH for sommelier and sommelier-x to fix GPU acceleration on some devices
+	# set LIBGL_DRIVERS_PATH for sommelier and sommelier-x to fix GPU acceleration on some devices
 	sed -i '$ s|$|\nEnvironment="LIBGL_DRIVERS_PATH=/opt/google/cros-containers/lib"|' ${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-override.conf
 	sed -i '$ s|$|\nEnvironment="LIBGL_DRIVERS_PATH=/opt/google/cros-containers/lib"|' ${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-x-override.conf
 
@@ -124,34 +119,9 @@ package() {
 	install -m644 -D ${srcdir}/${_pkgname}/cros-sommelier-config/cros-sommelier-low-density-override.conf \
 					 ${pkgdir}/usr/lib/systemd/user/sommelier-x@1.service.d/cros-sommelier-low-density-override.conf
 
-	### cros-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 \
-		-e 's|=/usr|=/opt/google/cros-containers|g' \
-		-e 's|/usr/share/fonts/X11|/usr/share/fonts|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@.service \
-		   ${pkgdir}/usr/lib/systemd/user/default.target.wants/sommelier@1.service
-	ln -sf ../sommelier-x@.service \
-		   ${pkgdir}/usr/lib/systemd/user/default.target.wants/sommelier-x@0.service
-	ln -sf ../sommelier-x@.service \
-		   ${pkgdir}/usr/lib/systemd/user/default.target.wants/sommelier-x@1.service
-
 	### cros-sudo-config
 
-	install -m440 -D ${srcdir}/${_pkgname}/cros-sudo-config/10-cros-nopasswd \
-					 ${pkgdir}/etc/sudoers.d/10-cros-nopasswd
+	install -m440 -D ${srcdir}/${_pkgname}/cros-sudo-config/10-cros-nopasswd ${pkgdir}/etc/sudoers.d/10-cros-nopasswd
 
 	# replace sudo group with wheel group for no password sudo access
 	sed -i 's/%sudo/%wheel/1' ${pkgdir}/etc/sudoers.d/10-cros-nopasswd
@@ -162,21 +132,14 @@ package() {
 
 	### cross-ui-config
 
-	install -m644 -D ${srcdir}/${_pkgname}/cros-ui-config/gtkrc \
-				     ${pkgdir}/etc/gtk-2.0/gtkrc
-	install -m644 -D ${srcdir}/${_pkgname}/cros-ui-config/settings.ini \
-				     ${pkgdir}/etc/gtk-3.0/settings.ini
-	install -m644 -D ${srcdir}/${_pkgname}/cros-ui-config/01-cros-ui \
-				     ${pkgdir}/etc/dconf/db/local.d/01-cros-ui
-	install -m644 -D ${srcdir}/${_pkgname}/cros-ui-config/user \
-				     ${pkgdir}/etc/dconf/profile/user
-	install -m644 -D ${srcdir}/${_pkgname}/cros-ui-config/Trolltech.conf \
-				     ${pkgdir}/etc/xdg/Trolltech.conf
+	install -m644 -D ${srcdir}/${_pkgname}/cros-ui-config/gtkrc ${pkgdir}/etc/gtk-2.0/gtkrc
+	install -m644 -D ${srcdir}/${_pkgname}/cros-ui-config/settings.ini ${pkgdir}/etc/gtk-3.0/settings.ini
+	install -m644 -D ${srcdir}/${_pkgname}/cros-ui-config/01-cros-ui ${pkgdir}/etc/dconf/db/local.d/01-cros-ui
+	install -m644 -D ${srcdir}/${_pkgname}/cros-ui-config/user ${pkgdir}/etc/dconf/profile/user
+	install -m644 -D ${srcdir}/${_pkgname}/cros-ui-config/Trolltech.conf ${pkgdir}/etc/xdg/Trolltech.conf
 
 	### cros-wayland
 
-	install -m644 -D ${srcdir}/${_pkgname}/cros-wayland/10-cros-virtwl.rules \
-					 ${pkgdir}/usr/lib/udev/rules.d/10-cros-virtwl.rules
-	install -m644 -D ${srcdir}/${_pkgname}/cros-wayland/skel.weston.ini \
-					 ${pkgdir}/etc/skel/.config/weston.ini
+	install -m644 -D ${srcdir}/${_pkgname}/cros-wayland/10-cros-virtwl.rules ${pkgdir}/usr/lib/udev/rules.d/10-cros-virtwl.rules
+	install -m644 -D ${srcdir}/${_pkgname}/cros-wayland/skel.weston.ini ${pkgdir}/etc/skel/.config/weston.ini
 }
diff --git a/cros-container-guest-tools.install b/cros-container-guest-tools.install
index fc26032746ab..05d9ab3f4ea6 100644
--- a/cros-container-guest-tools.install
+++ b/cros-container-guest-tools.install
@@ -2,7 +2,7 @@ post_install() {
 
 	# update dconf after GTK+ theme installed
 	if hash dconf 2>/dev/null; then
-    	dconf update
+		dconf update
 	fi
 
 	# mask systemd-journald-audit.socket, which fails inside unprivileged container
@@ -23,11 +23,13 @@ post_upgrade() {
 
 cat << EOF
 
-	(!) This package is permanently work in progress until Crostini 
-	considered to be stable by Google, issues and bugs are expected!
+	(!) This package is permanently work-in-progress while Crostini
+	is in beta. Missing features, issues and bugs are possible!
 
-	Tested on Google Pixelbook and Samsung Chromebook Plus, should
-	work fine on other Chromebooks/Chromeboxes with Crostini enabled.
+	Developed and tested on Google Pixelbook, but should work fine 
+    on other Chromebooks/Chromeboxes with Crostini enabled. 
+
+	Please report any issues to the AUR page!
 
 EOF
 
@@ -37,7 +39,7 @@ post_remove() {
 
 	# update dconf after GTK+ theme installed
 	if hash dconf 2>/dev/null; then
-    	dconf update 2>/dev/null
+		dconf update 2>/dev/null
 	fi
 
 	# unmask systemd-journald-audit.socket
@@ -45,5 +47,4 @@ post_remove() {
 
 	# workaround for https://bugs.archlinux.org/task/58701 - remove after fix
 	rm /usr/share/themes/CrosAdapta
-
 }