From da600e11d9b569767c8fc2b70e577133d3a3b643 Mon Sep 17 00:00:00 2001
From: Florian Vahl <florian@flova.de>
Date: Thu, 18 Jan 2024 16:35:36 +0100
Subject: [PATCH] Add https flag

---
 .github/workflows/build.yml | 2 +-
 Makefile                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 25cd296cb..ce6afe646 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
           mkdir -p /colcon_ws/src
           ln -s $(realpath .) /colcon_ws/src/bitbots_meta
       - name: Pull our software
-        run: make pull-init --use-https
+        run: make pull-init HTTPS=true
         working-directory: /colcon_ws/src/bitbots_meta
       - name: Install proprietary basler drivers
         run: make basler ARGS="-ci"
diff --git a/Makefile b/Makefile
index 917803c65..6f2e2ef49 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY : basler install pip pre-commit pull-all pull-init pull-files rosdep status update
 
-HTTPS_FLAG := --use-https
+HTTPS := ""
 
 basler:
 	scripts/make_basler.sh $(ARGS)
@@ -25,7 +25,7 @@ pull-all:
 
 pull-init:
 	git pull
-ifeq ($(filter $(HTTPS_FLAG),$(filter-out $<,$(MAKECMDGOALS))),$(HTTPS_FLAG))
+ifeq ($(HTTPS), true)
 	awk '{sub("git@github.com:", "https://github.com/"); print "  " $$0}' workspace.repos | vcs import .. --skip-existing
 else
 	vcs import .. --skip-existing < workspace.repos