From e366fcf8ea4335374112d77a107b5a2821ad3912 Mon Sep 17 00:00:00 2001 From: Tobias Wolf Date: Wed, 29 Jan 2025 22:35:52 +0100 Subject: [PATCH] Fix Debian packaging if guest agent manager is not checked out (#485) Signed-off-by: Tobias Wolf --- packaging/debian/rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packaging/debian/rules b/packaging/debian/rules index a0284072..3e45282c 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -22,7 +22,7 @@ override_dh_auto_install: install -p -m 0644 instance_configs.cfg debian/google-guest-agent/usr/share/google-guest-agent install -d debian/google-guest-agent/lib/systemd/system install -p -m 0644 gce-workload-cert-refresh.timer debian/google-guest-agent/lib/systemd/system/ - if [[ -d google-guest-agent ]]; then\ + if [ -d google-guest-agent ]; then\ install -p -m 0644 google-guest-agent/cmd/google_guest_agent/google_guest_agent debian/google-guest-agent/usr/bin/google_guest_agent_manager;\ fi @@ -31,7 +31,7 @@ override_dh_golang: override_dh_auto_build: dh_auto_build -O--buildsystem=golang -- -ldflags="-s -w -X main.version=$(VERSION)" -mod=readonly - if [[ -d google-guest-agent ]]; then\ + if [ -d google-guest-agent ]; then\ VERSION=$(VERSION) make -C google-guest-agent cmd/google_guest_agent/google_guest_agent;\ fi @@ -42,13 +42,13 @@ override_dh_systemd_enable: install -d debian/google-guest-agent/lib/systemd/system install -p -m 0644 *.service debian/google-guest-agent/lib/systemd/system/ # Don't include guest agent manager if not building with it. - if [[ ! -d google-guest-agent ]]; then\ - rm -f debian/google-guest-agent/lib/systemd/systemd/google-guest-agent-manager.service;\ + if [ ! -d google-guest-agent ]; then\ + rm -f debian/google-guest-agent/lib/systemd/system/google-guest-agent-manager.service;\ fi install -d debian/google-guest-agent/lib/systemd/system-preset install -p -m 0644 *.preset debian/google-guest-agent/lib/systemd/system-preset/ dh_systemd_enable google-guest-agent.service google-startup-scripts.service google-shutdown-scripts.service gce-workload-cert-refresh.timer - if [[ -d google-guest-agent ]]; then\ + if [ -d google-guest-agent ]; then\ dh_systemd_enable google-guest-agent-manager.service;\ fi @@ -56,6 +56,6 @@ override_dh_systemd_start: # Only perform start/stop actions for the guest agent and cert refresh timer. dh_systemd_start google-guest-agent.service dh_systemd_start gce-workload-cert-refresh.timer - if [[ -d google-guest-agent ]]; then\ + if [ -d google-guest-agent ]; then\ dh_systemd_start google-guest-agent-manager.service;\ fi