From 8bc6a4daa9494d722aed02b0a132834174ca9b72 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Sat, 8 Jan 2022 07:44:05 +0100 Subject: [PATCH] set PATH in main instead of run_setup --- mmdebstrap | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mmdebstrap b/mmdebstrap index 5b297ee..1fa65ea 100755 --- a/mmdebstrap +++ b/mmdebstrap @@ -1959,15 +1959,6 @@ sub run_setup() { } } - # setting PATH for chroot, ldconfig, start-stop-daemon... - if (length $ENV{PATH}) { - ## no critic (Variables::RequireLocalizedPunctuationVars) - $ENV{PATH} = "$ENV{PATH}:/usr/sbin:/usr/bin:/sbin:/bin"; - } else { - ## no critic (Variables::RequireLocalizedPunctuationVars) - $ENV{PATH} = "/usr/sbin:/usr/bin:/sbin:/bin"; - } - return; } @@ -4334,7 +4325,11 @@ sub main() { error "invalid format. Choose from " . (join ', ', @valid_formats); } - if (!defined $ENV{PATH} || $ENV{PATH} eq "") { + # setting PATH for chroot, ldconfig, start-stop-daemon... + if (length $ENV{PATH}) { + ## no critic (Variables::RequireLocalizedPunctuationVars) + $ENV{PATH} = "$ENV{PATH}:/usr/sbin:/usr/bin:/sbin:/bin"; + } else { ## no critic (Variables::RequireLocalizedPunctuationVars) $ENV{PATH} = "/usr/sbin:/usr/bin:/sbin:/bin"; }