From 6141a7d7ff92c6c7ed8ec049aced507f582c53f4 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 4 Dec 2018 13:42:46 -0800 Subject: [PATCH] Move to toybox basename(1). Test: treehugger Change-Id: I29f210d86a0dada8a40eca1919e2f6f876d50bcd --- ui/build/paths/config.go | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go index db2e3bbcf..3ece649be 100644 --- a/ui/build/paths/config.go +++ b/ui/build/paths/config.go @@ -75,7 +75,6 @@ func GetConfig(name string) PathConfig { var Configuration = map[string]PathConfig{ "awk": Allowed, - "basename": Allowed, "bash": Allowed, "bc": Allowed, "bzip2": Allowed, @@ -161,23 +160,24 @@ var Configuration = map[string]PathConfig{ "pkg-config": Forbidden, // On linux we'll use the toybox version of these instead - "cat": Toybox, - "comm": Toybox, - "env": Toybox, - "id": Toybox, - "od": Toybox, - "paste": Toybox, - "pwd": Toybox, - "rmdir": Toybox, - "setsid": Toybox, - "sleep": Toybox, - "tail": Toybox, - "tee": Toybox, - "true": Toybox, - "uname": Toybox, - "uniq": Toybox, - "whoami": Toybox, - "xxd": Toybox, + "basename": Toybox, + "cat": Toybox, + "comm": Toybox, + "env": Toybox, + "id": Toybox, + "od": Toybox, + "paste": Toybox, + "pwd": Toybox, + "rmdir": Toybox, + "setsid": Toybox, + "sleep": Toybox, + "tail": Toybox, + "tee": Toybox, + "true": Toybox, + "uname": Toybox, + "uniq": Toybox, + "whoami": Toybox, + "xxd": Toybox, } func init() {