Create yq.lima symlink on host and in VM

Signed-off-by: Jan Dubois <[email protected]>

Author: jandubois

Makefile

@@ -87,7 +87,7 @@ help-targets:
 	@echo  'Targets for files in _output/bin/:'
 	@echo  '- limactl                   : Build limactl, and lima'
 	@echo  '- lima                      : Copy lima, and lima.bat'
-	@echo  '- helpers                   : Copy nerdctl.lima, apptainer.lima, docker.lima, podman.lima, and kubectl.lima'
+	@echo  '- helpers                   : Copy nerdctl.lima, apptainer.lima, docker.lima, podman.lima, kubectl.lima, and yq.lima'
 	@echo
 	@echo  'Targets for files in _output/share/lima/:'
 	@echo  '- guestagents               : Build guestagents'
@@ -277,10 +277,17 @@ LIMA_CMDS = $(sort lima lima$(bat)) # $(sort ...) deduplicates the list
 LIMA_DEPS = $(addprefix _output/bin/,$(LIMA_CMDS))
 lima: $(LIMA_DEPS)
 
-HELPER_CMDS = nerdctl.lima apptainer.lima docker.lima podman.lima kubectl.lima
+HELPER_CMDS = nerdctl.lima apptainer.lima docker.lima podman.lima kubectl.lima yq.lima$(exe)
 HELPERS_DEPS = $(addprefix _output/bin/,$(HELPER_CMDS))
 helpers: $(HELPERS_DEPS)
 
+_output/bin/yq.lima$(exe): _output/bin/limactl$(exe)
+ifneq ($(GOOS),windows)
+	ln -sf limactl$(exe) $@
+else
+	cp -aL $< $@
+endif
+
 _output/bin/%: ./cmd/% | _output/bin
 	cp -a $< $@
 
@@ -493,6 +500,7 @@ uninstall:
 		"$(DEST)/bin/docker.lima" \
 		"$(DEST)/bin/podman.lima" \
 		"$(DEST)/bin/kubectl.lima" \
+		"$(DEST)/bin/yq.lima$(exe)" \
 		"$(DEST)/share/man/man1/lima.1" \
 		"$(DEST)/share/man/man1/limactl"*".1" \
 		"$(DEST)/share/lima" "$(DEST)/share/doc/lima"

cmd/yq/yq.go

@@ -35,7 +35,8 @@ func main() {
 // Only returns to caller if os.Args doesn't contain a `yq` command.
 func MaybeRunYQ() {
 	progName := filepath.Base(os.Args[0])
-	progName = strings.TrimSuffix(progName, filepath.Ext(progName))
+	// remove all extensions, so we match "yq.lima.exe"
+	progName, _, _ = strings.Cut(progName, ".")
 	if progName == "yq" {
 		main()
 	}

pkg/cidata/cidata.TEMPLATE.d/boot.sh

@@ -57,6 +57,9 @@ deref() {
 	eval echo \$"$1"
 }
 
+# Add yq.lima to the PATH
+export PATH="${LIMA_CIDATA_GUEST_INSTALL_PREFIX}/bin:$PATH"
+
 if [ -d "${LIMA_CIDATA_MNT}"/provision.data ]; then
 	for f in "${LIMA_CIDATA_MNT}"/provision.data/*; do
 		filename=$(basename "$f")

pkg/cidata/cidata.TEMPLATE.d/boot/25-guestagent-base.sh

@@ -19,6 +19,7 @@ fi
 
 # Install or update the guestagent binary
 install -m 755 "${LIMA_CIDATA_MNT}"/lima-guestagent "${LIMA_CIDATA_GUEST_INSTALL_PREFIX}"/bin/lima-guestagent
+ln -sf "${LIMA_CIDATA_GUEST_INSTALL_PREFIX}"/bin/lima-guestagent "${LIMA_CIDATA_GUEST_INSTALL_PREFIX}"/bin/yq.lima
 
 # Launch the guestagent service
 if [ -f /sbin/openrc-run ]; then