From 6061218b8381d6e5dc35b09f408c60ba64e9f9f2 Mon Sep 17 00:00:00 2001
From: Timon Engelke <timon.engelke@online.de>
Date: Wed, 29 Nov 2023 11:58:50 +0100
Subject: [PATCH] Use Makefile instead of make_* scripts

---
 Makefile                   | 19 ++++++++++++-------
 scripts/make_install.sh    |  4 ----
 scripts/make_pip.sh        |  4 ----
 scripts/make_pre-commit.sh |  4 ----
 scripts/make_rosdep.sh     |  5 -----
 scripts/make_update.sh     |  5 -----
 6 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100755 scripts/make_install.sh
 delete mode 100755 scripts/make_pip.sh
 delete mode 100755 scripts/make_pre-commit.sh
 delete mode 100755 scripts/make_rosdep.sh
 delete mode 100755 scripts/make_update.sh

diff --git a/Makefile b/Makefile
index fb213110d..60f2d368c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,18 @@
 basler:
 	scripts/make_basler.sh $(ARGS)
 
-install: pull-init
-	scripts/make_update.sh
+install: pull-init basler update
+
+master:
+	git submodule foreach -q --recursive 'branch="$$(git config -f $$toplevel/.gitmodules submodule.$$name.branch)"; [ "$$branch" = "" ] && git switch -q master || git switch -q $$branch'
 
 pip:
-	scripts/make_pip.sh
+	# Install and upgrade pip dependencies
+	pip install --upgrade -r requirements/dev.txt
 
 pre-commit:
-	scripts/make_pre-commit.sh
+	# Install pre-commit hooks for all submodules that have a .pre-commit-config.yaml file
+	git submodule foreach -q --recursive "test -f .pre-commit-config.yaml && pre-commit install || :"
 
 pull-all:
 	git pull
@@ -26,10 +30,11 @@ pull-files:
 	scripts/pull_files.bash
 
 rosdep:
-	scripts/make_rosdep.sh
+	# Update rosdep and install dependencies from meta directory
+	rosdep update
+	rosdep install -iry --from-paths .
 
 status:
 	scripts/git_status.bash
 
-update: pull-all
-	scripts/make_update.sh
+update: pull-all rosdep pip pre-commit
diff --git a/scripts/make_install.sh b/scripts/make_install.sh
deleted file mode 100755
index 0cbc75d42..000000000
--- a/scripts/make_install.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-scripts/make_basler.sh
-scripts/make_update.sh
diff --git a/scripts/make_pip.sh b/scripts/make_pip.sh
deleted file mode 100755
index 2df8e746e..000000000
--- a/scripts/make_pip.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Install and upgrade pip dependencies
-pip install --upgrade -r requirements/dev.txt
diff --git a/scripts/make_pre-commit.sh b/scripts/make_pre-commit.sh
deleted file mode 100755
index ad0014f68..000000000
--- a/scripts/make_pre-commit.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Install pre-commit hooks for all submodules that have a .pre-commit-config.yaml file
-git submodule foreach "test -f .pre-commit-config.yaml && pre-commit install || :"
diff --git a/scripts/make_rosdep.sh b/scripts/make_rosdep.sh
deleted file mode 100755
index 173b9644b..000000000
--- a/scripts/make_rosdep.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Update rosdep and install dependencies from meta directory
-rosdep update
-rosdep install -iry --from-paths .
diff --git a/scripts/make_update.sh b/scripts/make_update.sh
deleted file mode 100755
index f141c651d..000000000
--- a/scripts/make_update.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-scripts/make_rosdep.sh
-scripts/make_pip.sh
-scripts/make_pre-commit.sh