From 127bfa0d8b5a49031c7919258f12e101dc44d496 Mon Sep 17 00:00:00 2001
From: Bryson Steck <me@brysonsteck.xyz>
Date: Sun, 2 Mar 2025 12:33:15 -0700
Subject: [PATCH] fix all tag, also install base-devel and use user ids

---
 Dockerfile | 4 ++--
 build      | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 69e83a9..f0cc814 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM archlinux:latest
-ARG TOOLS=""
+ARG TOOLS="wii-dev"
 ARG UID="1000"
 ARG GID="1000"
 
@@ -16,7 +16,7 @@ RUN echo Include = /etc/pacman.d/devkitpro.conf >> /etc/pacman.conf
 RUN pacman -Syu --noconfirm
 
 # install tools
-RUN pacman -Sy --noconfirm $TOOLS
+RUN pacman -Sy --noconfirm base-devel $TOOLS
 
 # setup environment
 RUN groupadd -g $GID devkitpro
diff --git a/build b/build
index 4d548ed..c62e03e 100755
--- a/build
+++ b/build
@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 
+uid=$(id -u)
+gid=$(id -g)
 kits=(gp32-dev gp2x-dev gba-dev nds-dev 3ds-dev gamecube-dev wii-dev wiiu-dev switch-dev)
 
 for kit in ${kits[@]}; do
-  docker build -t devkitpro:$(echo $kit | sed "s|-dev||") --build-arg TOOLS="$kit" .
+  echo building $kit...
+  docker build -t devkitpro:$(echo $kit | sed "s|-dev||") --build-arg TOOLS="$kit" --build-arg UID=$uid --build-arg GID=$gid .
 done
 
-docker build -t devkitpro:all --build-arg TOOLS="${kits[@]}" .
-
+echo building all devkits...
+docker build -t devkitpro:all --build-arg TOOLS="$(echo "${kits[@]}")" --build-arg UID=$uid --build-arg GID=$gid .