From 6f92869f6ead0439fe67c76cf208a0d8e26399bd Mon Sep 17 00:00:00 2001
From: June Tate-Gans <june@theonelab.com>
Date: Fri, 29 Mar 2024 10:18:38 -0500
Subject: [PATCH] manjaro: Rename to archlinux

---
 .drone.yml           |  4 ++--
 Makefile             | 14 +++++++-------
 tools/dockerbuild.sh |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b924f27..b50ba81 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,7 +1,7 @@
 ---
 kind: pipeline
 type: drone
-name: manjaro
+name: archlinux
 
 steps:
   - name: build
@@ -20,7 +20,7 @@ steps:
       mtu: 1000
 
     commands:
-      - tools/dockerbuild.sh manjaro
+      - tools/dockerbuild.sh archlinux
 
   - name: test
     image: archlinux:latest
diff --git a/Makefile b/Makefile
index 8b17e25..55f7641 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,8 @@ ifeq (${DISTRO},ubuntu)
 DISTRO := debian
 endif
 
-ifeq (${DISTRO},arch)
-DISTRO := manjaro
+ifeq (${DISTRO},manjaro)
+DISTRO := archlinux
 endif
 
 $(warning Building on ${DISTRO})
@@ -29,18 +29,18 @@ clean: ${DISTRO}-clean
 
 install: ${DISTRO}-install
 
-manjaro:
+archlinux:
 	mkdir -p build
 	makepkg --nodeps
 	mv g13gui*.pkg.tar.zst build
 
-manjaro-clean:
+archlinux-clean:
 	rm -f g13gui-git-*-any.pkg.tar.zst
 	rm -rf g13gui-git/
 	rm -rf pkg/
 	rm -rf src/
 
-manjaro-install:
+archlinux-install:
 	makepkg -i
 
 fedora:
@@ -86,9 +86,9 @@ dist: clean
 	tar --exclude=build --exclude=.drone.yml --exclude-vcs -zcf build/g13gui_$(VERSION).tar.gz .
 	docker run -ti -v ${PWD}:/srcs -w /srcs fedora:latest tools/dockerbuild.sh fedora
 	docker run -ti -v ${PWD}:/srcs -w /srcs debian:latest tools/dockerbuild.sh debian
-	docker run -ti -v ${PWD}:/srcs -w /srcs archlinux:latest tools/dockerbuild.sh arch
+	docker run -ti -v ${PWD}:/srcs -w /srcs archlinux:latest tools/dockerbuild.sh archlinux
 
 .PHONY: all clean install test
-.PHONY: manjaro manjaro-clean manjaro-install
+.PHONY: archlinux archlinux-clean archlinux-install
 .PHONY: debian debian-build debian-clean debian-build-source debian-release
 
diff --git a/tools/dockerbuild.sh b/tools/dockerbuild.sh
index 065db99..6fc3ca6 100755
--- a/tools/dockerbuild.sh
+++ b/tools/dockerbuild.sh
@@ -19,7 +19,7 @@ DISTRO="$1"; shift
 [[ -z "${DISTRO}" ]] && die "Usage: dockerbuild.sh <distro>"
 
 case "${DISTRO}" in
-	manjaro)
+	archlinux)
 		try pacman -Sy --noconfirm
 		try pacman -S --noconfirm base-devel python meson lsb-release git