From a248d8321a3159eafe5cf54a6c60684850b9c560 Mon Sep 17 00:00:00 2001
From: Ella-0 <23418164+Ella-0@users.noreply.github.com>
Date: Wed, 19 May 2021 12:32:51 +0100
Subject: [PATCH] toybox: 0.8.5

---
 pkgs/toybox/build.sh        |  3 ++-
 pkgs/toybox/ls-colour.patch | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/toybox/ls-colour.patch

diff --git a/pkgs/toybox/build.sh b/pkgs/toybox/build.sh
index e6d08fc..dd9a5c8 100644
--- a/pkgs/toybox/build.sh
+++ b/pkgs/toybox/build.sh
@@ -1,4 +1,4 @@
-pkgver=0.8.4
+pkgver=0.8.5
 pkgname=toybox
 pkgrel=1
 deps="musl:pci-ids"
@@ -7,6 +7,7 @@ fetch() {
 	curl "http://www.landley.net/toybox/downloads/$pkgname-$pkgver.tar.gz" -o $pkgname-$pkgver.tar.gz
 	tar -xf $pkgname-$pkgver.tar.gz
 	cd $pkgname-$pkgver
+	patch -p1 < ../../ls-colour.patch
 	patch -p1 < ../../mksh-make.patch
 }
 
diff --git a/pkgs/toybox/ls-colour.patch b/pkgs/toybox/ls-colour.patch
new file mode 100644
index 0000000..b39c2fc
--- /dev/null
+++ b/pkgs/toybox/ls-colour.patch
@@ -0,0 +1,15 @@
+--- a/toys/posix/ls.c
++++ b/toys/posix/ls.c
+@@ -513,9 +513,11 @@
+     if (!FLAG(show_control_chars)) toys.optflags |= FLAG_b;
+     if (FLAG(l)||FLAG(o)||FLAG(n)||FLAG(g)) toys.optflags |= FLAG_1;
+     else if (!(FLAG(1)||FLAG(x)||FLAG(m))) toys.optflags |= FLAG_C;
++    if (TT.color && !strcmp(TT.color, "never")) toys.optflags ^= FLAG_color;
++    else toys.optflags |= FLAG_color;
+   } else {
+     if (!FLAG(m)) toys.optflags |= FLAG_1;
+-    if (TT.color) toys.optflags ^= FLAG_color;
++    if (TT.color && strcmp(TT.color, "always")) toys.optflags ^= FLAG_color;
+   }
+ 
+   TT.screen_width = 80;