diff options
| author | Jim Pryor <profjim@jimpryor.net> | 2009-09-14 05:43:45 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-09-14 08:26:34 +0200 |
| commit | 2c5d0f94f08527151267482f67f1c4964f0a75e1 (patch) | |
| tree | 39fb7c983e6b6ae3bac13e661edd821061ebbd84 /src/netcfg-menu | |
| parent | b6c8f97e5e6fd2b5f331e37d891b22ef8598cc09 (diff) | |
| download | netctl-2c5d0f94f08527151267482f67f1c4964f0a75e1.tar.gz netctl-2c5d0f94f08527151267482f67f1c4964f0a75e1.tar.xz | |
More localized sourcing
When we're sourcing a profile just to obtain a single variable, use the
form:
INTERFACE=$(. "$DIR/$profile"; echo "$INTERFACE")
This makes it clearer in the source what we're expecting to obtain from
the profile, and what we're ignoring. Also allows us to eliminate some
more inclusive subshells.
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src/netcfg-menu')
| -rw-r--r-- | src/netcfg-menu | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/netcfg-menu b/src/netcfg-menu index a054fe7..505a91b 100644 --- a/src/netcfg-menu +++ b/src/netcfg-menu @@ -11,11 +11,9 @@ i=0 while read prof; do # if there is a profile called "main", Use as default [[ "$prof" = "main" ]] && DEFAULT="main" - unset DESCRIPTION # JP: we can''t sandbox the sourced profiles, because we need to expose profiles[] - . "$PROFILE_DIR/$prof" profiles[$i]="$prof" let i++ - profiles[$i]="$DESCRIPTION" # JP: this will usually have spaces and must be quoted + profiles[$i]=$(. "$PROFILE_DIR/$prof"; echo "$DESCRIPTION") let i++ done < <(list_profiles | sort) # JP: re-use list_profiles instead of duplicating it; avoid subshell we'd get by piping it to the while read... |